kwalletd: do not attempt to open wallet via PAM if wallet is disabled

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-09-15 06:05:35 +03:00
parent fc7b2df492
commit 678dc2966e

View file

@ -38,6 +38,7 @@
static int pipefd = 0;
static int socketfd = 0;
static bool isWalletEnabled()
{
KConfig cfg("kwalletrc");
@ -144,6 +145,12 @@ char* checkPamModule(int argc, char **argv)
int main(int argc, char **argv)
{
// check if kwallet is disabled
if (!isWalletEnabled()) {
kDebug() << "kwalletd is disabled!";
return (0);
}
char *hash = NULL;
if (getenv("PAM_KWALLET_LOGIN")) {
hash = checkPamModule(argc, argv);
@ -166,12 +173,6 @@ int main(int argc, char **argv)
app.disableSessionManagement();
app.setQuitOnLastWindowClosed( false );
// check if kwallet is disabled
if (!isWalletEnabled()) {
kDebug() << "kwalletd is disabled!";
return (0);
}
if (!KUniqueApplication::start()) {
kDebug() << "kwalletd is already running!";
return (0);