hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2026-05-19 19:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

pam: fix some logic cleanup

Browse source
This commit is contained in:
Maximilian Seidler 2026-04-29 18:47:42 +02:00
parent 57d7084c6a
commit b854006b7b
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/auth/Pam.cpp
View file

@ -27,18 +27,17 @@ int conv(int num_msg, const struct pam_message** msg, struct pam_response** resp
const auto PROMPTCHANGED = PROMPT != CONVERSATIONSTATE->prompt;
Log::logger->log(Log::INFO, "PAM_PROMPT: {}", PROMPT);
if (PROMPTCHANGED)
g_pHyprlock->enqueueForceUpdateTimers();
// Some pam configurations ask for the password twice for whatever reason (Fedora su for example)
// When the prompt is the same as the last one, I guess our answer can be the same.
if (initialPrompt || PROMPTCHANGED) {
CONVERSATIONSTATE->prompt = PROMPT;
g_pHyprlock->enqueueForceUpdateTimers();
CONVERSATIONSTATE->waitForInput();
}
// Needed for unlocks via SIGUSR1
if (g_pHyprlock->isUnlocked())
if (g_pHyprlock->m_bTerminate)
return PAM_CONV_ERR;
pamReply[i].resp = strdup(CONVERSATIONSTATE->input.c_str());
@ -84,13 +83,13 @@ void CPam::init() {
resetConversation();
// For grace or SIGUSR1 unlocks
if (g_pHyprlock->isUnlocked())
if (g_pHyprlock->m_bTerminate)
return;
const auto AUTHENTICATED = auth();
// For SIGUSR1 unlocks
if (g_pHyprlock->isUnlocked())
if (g_pHyprlock->m_bTerminate)
return;
if (!AUTHENTICATED)