pam-util: include cache ID of bus connection in the log message

To make it easier to debug issues like #31375.

diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c
index 0e24af450d924c0b4cebed1fc2e396ba255d8675..fabe21f0ccb2316fdd106bda9fd7a87bb7acd035 100644 (file)
--- a/src/shared/pam-util.c
+++ b/src/shared/pam-util.c
@@ -96,7 +96,9 @@ static void pam_bus_data_destroy(pam_handle_t *handle, void *data, int error_sta
         if (FLAGS_SET(error_status, PAM_DATA_SILENT) &&
             d->bus && bus_origin_changed(d->bus))
                 /* Please adjust test/units/end.sh when updating the log message. */
-                pam_syslog(handle, LOG_DEBUG, "Attempted to close sd-bus after fork whose connection is opened before the fork, this should not happen.");
+                pam_syslog(handle, LOG_DEBUG,
+                           "Attempted to close sd-bus (%s) after fork whose connection is opened before the fork, this should not happen.",
+                           strna(d->cache_id));
 
         pam_bus_data_free(data);
 }

diff --git a/test/units/end.sh b/test/units/end.sh
index 230b716e2f18f440f21b46cc856da66106f7aec1..412e0a96a2f84e5840a37989547077ee6bf3dd19 100755 (executable)
--- a/test/units/end.sh
+++ b/test/units/end.sh
@@ -7,7 +7,7 @@ set -o pipefail
 (! journalctl -q -o short-monotonic --grep "didn't pass validation" >>/failed)
 
 # Here, the redundant '[.]' at the end is for making not the logged self command hit the grep.
-(! journalctl -q -o short-monotonic --grep 'Attempted to close sd-bus after fork whose connection is opened before the fork, this should not happen[.]' >>/failed)
+(! journalctl -q -o short-monotonic --grep 'Attempted to close sd-bus (.*) after fork whose connection is opened before the fork, this should not happen[.]' >>/failed)
 
 systemctl poweroff --no-block
 exit 0