From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 19 Nov 2018 10:39:45 +0000 (+0100)
Subject: pam_systemd: suppress LOG_DEBUG log messages if debugging is off
X-Git-Tag: archive/raspbian/239-15+rpi1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a2ef5a088c4a847fb54327af8b2fb0458512cec;p=systemd.git

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)

Gbp-Pq: Name pam_systemd-suppress-LOG_DEBUG-log-messages-if-debugging-.patch
---

diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 1fbf6ba5..ebd35259 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -417,7 +417,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;
         }
 
@@ -518,7 +519,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));