From ffd83ff88d5f90e1581cf16922c84c0b2fe07984 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 23 Nov 2021 09:22:50 +0200 Subject: [PATCH] kwalletd: do not exit immediately if wallet is disabled fixes hangup due to timeout in attempt to reach its D-Bus interface in KCM when wallet is disabled Signed-off-by: Ivailo Monev --- kwalletd/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kwalletd/main.cpp b/kwalletd/main.cpp index 3d569b62..d073af33 100644 --- a/kwalletd/main.cpp +++ b/kwalletd/main.cpp @@ -146,13 +146,13 @@ char* checkPamModule(int argc, char **argv) int main(int argc, char **argv) { // check if kwallet is disabled - if (!isWalletEnabled()) { + const bool enabled = isWalletEnabled(); + if (!enabled) { kDebug() << "kwalletd is disabled!"; - return (0); } char *hash = NULL; - if (getenv("PAM_KWALLET_LOGIN")) { + if (enabled && getenv("PAM_KWALLET_LOGIN")) { hash = checkPamModule(argc, argv); } -- 2.11.0