SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pam-systemd-home: various logging cleanups

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-22 09:42:41 +09:00
parent 447eb0a00c
commit 924081f793
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/home/pam_systemd_home.c
+12 -11
View File
@@ -62,7 +62,7 @@ static int parse_argv(
*debug = k;
} else
pam_syslog(handle, LOG_WARNING, "Unknown parameter '%s', ignoring", argv[i]);
pam_syslog(handle, LOG_WARNING, "Unknown parameter '%s', ignoring.", argv[i]);
}
return 0;
@@ -186,9 +186,8 @@ static int acquire_user_record(
goto user_unknown;
}
pam_syslog(handle, LOG_ERR,
"Failed to query user record: %s", bus_error_message(&error, r));
return PAM_SERVICE_ERR;
return pam_syslog_pam_error(handle, LOG_ERR, PAM_SERVICE_ERR,
"Failed to query user record: %s", bus_error_message(&error, r));
}
r = sd_bus_message_read(reply, "sbo", &json, NULL, NULL);
@@ -684,8 +683,10 @@ static int acquire_home(
if (home_locked)
(void) pam_prompt_graceful(handle, PAM_ERROR_MSG, NULL, _("Home of user %s is currently locked, please unlock locally first."), ur->user_name);
if (FLAGS_SET(flags, ACQUIRE_MUST_AUTHENTICATE) || debug)
pam_syslog(handle, FLAGS_SET(flags, ACQUIRE_MUST_AUTHENTICATE) ? LOG_ERR : LOG_DEBUG, "Failed to prompt for password/prompt.");
if (FLAGS_SET(flags, ACQUIRE_MUST_AUTHENTICATE))
pam_syslog(handle, LOG_ERR, "Failed to prompt for password/prompt.");
else if (debug)
pam_debug_syslog(handle, debug, "Failed to prompt for password/prompt.");
return home_not_active || home_locked ? PAM_PERM_DENIED : PAM_CONV_ERR;
}
@@ -806,7 +807,7 @@ _public_ PAM_EXTERN int pam_sm_authenticate(
&debug) < 0)
return PAM_AUTH_ERR;
pam_debug_syslog(handle, debug, "pam-systemd-homed authenticating");
pam_debug_syslog(handle, debug, "pam-systemd-homed: authenticating...");
return acquire_home(handle, ACQUIRE_MUST_AUTHENTICATE|flags, debug, /* bus_data= */ NULL);
}
@@ -873,7 +874,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
&debug) < 0)
return PAM_SESSION_ERR;
pam_debug_syslog(handle, debug, "pam-systemd-homed session start");
pam_debug_syslog(handle, debug, "pam-systemd-homed: starting session...");
r = fallback_shell_can_work(handle, &flags);
if (r != PAM_SUCCESS)
@@ -923,7 +924,7 @@ _public_ PAM_EXTERN int pam_sm_close_session(
&debug) < 0)
return PAM_SESSION_ERR;
pam_debug_syslog(handle, debug, "pam-systemd-homed session end");
pam_debug_syslog(handle, debug, "pam-systemd-homed: closing session...");
r = pam_get_user(handle, &username, NULL);
if (r != PAM_SUCCESS)
@@ -991,7 +992,7 @@ _public_ PAM_EXTERN int pam_sm_acct_mgmt(
&debug) < 0)
return PAM_AUTH_ERR;
pam_debug_syslog(handle, debug, "pam-systemd-homed account management");
pam_debug_syslog(handle, debug, "pam-systemd-homed: starting account management...");
r = fallback_shell_can_work(handle, &flags);
if (r != PAM_SUCCESS)
@@ -1107,7 +1108,7 @@ _public_ PAM_EXTERN int pam_sm_chauthtok(
&debug) < 0)
return PAM_AUTH_ERR;
pam_debug_syslog(handle, debug, "pam-systemd-homed account management");
pam_debug_syslog(handle, debug, "pam-systemd-homed: starting authentication token management...");
r = acquire_user_record(handle, /* username= */ NULL, debug, &ur, /* bus_data= */ NULL);
if (r != PAM_SUCCESS)