aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-19 11:39:45 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-19 14:03:34 +0100
commit2675747f3cdd6f1e6236bbb2f79abfa53fb307f1 (patch)
treedacecce9ecc33705da8812b8287912352f3b80c3
parentMerge pull request #10698 from yuwata/udevd-replace-udev-device (diff)
downloadsystemd-2675747f3cdd6f1e6236bbb2f79abfa53fb307f1.tar.gz
systemd-2675747f3cdd6f1e6236bbb2f79abfa53fb307f1.tar.bz2
systemd-2675747f3cdd6f1e6236bbb2f79abfa53fb307f1.zip
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
-rw-r--r--src/login/pam_systemd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index e2b2281c6..c7d9dcf4e 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -466,7 +466,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;
}
@@ -567,7 +568,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));