44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From ea3910e561f043f5a131a846862955c77169da1b Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Mon, 19 Nov 2018 11:39:45 +0100
|
|
Subject: [PATCH] pam_systemd: suppress LOG_DEBUG log messages if debugging is
|
|
off
|
|
|
|
In the PAM module we need to suppress LOG_DEBUG messages manually, if
|
|
debug logging is not on, as PAM won't do this for us. We did this
|
|
correctly for most log messages already, but two were missing. Let's fix
|
|
those too.
|
|
|
|
Fixes: #10822
|
|
(cherry picked from commit 2675747f3cdd6f1e6236bbb2f79abfa53fb307f1)
|
|
|
|
Resolves: #2170084
|
|
---
|
|
src/login/pam_systemd.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
|
|
index 64e1b4d1bf..c87e980b18 100644
|
|
--- a/src/login/pam_systemd.c
|
|
+++ b/src/login/pam_systemd.c
|
|
@@ -476,7 +476,8 @@ _public_ PAM_EXTERN int pam_sm_open_session(
|
|
}
|
|
|
|
if (seat && !streq(seat, "seat0") && vtnr != 0) {
|
|
- pam_syslog(handle, LOG_DEBUG, "Ignoring vtnr %"PRIu32" for %s which is not seat0", vtnr, seat);
|
|
+ if (debug)
|
|
+ pam_syslog(handle, LOG_DEBUG, "Ignoring vtnr %"PRIu32" for %s which is not seat0", vtnr, seat);
|
|
vtnr = 0;
|
|
}
|
|
|
|
@@ -577,7 +578,8 @@ _public_ PAM_EXTERN int pam_sm_open_session(
|
|
r = sd_bus_call(bus, m, 0, &error, &reply);
|
|
if (r < 0) {
|
|
if (sd_bus_error_has_name(&error, BUS_ERROR_SESSION_BUSY)) {
|
|
- pam_syslog(handle, LOG_DEBUG, "Cannot create session: %s", bus_error_message(&error, r));
|
|
+ if (debug)
|
|
+ pam_syslog(handle, LOG_DEBUG, "Cannot create session: %s", bus_error_message(&error, r));
|
|
return PAM_SUCCESS;
|
|
} else {
|
|
pam_syslog(handle, LOG_ERR, "Failed to create session: %s", bus_error_message(&error, r));
|