From b5b2510800fa50187f5c7342cb9471fdb97bc4b0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 19 Feb 2024 12:02:04 +0900 Subject: [PATCH] pam-util: include cache ID of bus connection in the log message To make it easier to debug issues like #31375. --- src/shared/pam-util.c | 4 +++- test/units/end.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c index 0e24af450d9..fabe21f0ccb 100644 --- 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 230b716e2f1..412e0a96a2f 100755 --- 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