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

To make it easier to debug issues like #31375.
This commit is contained in:
Yu Watanabe 2024-02-19 12:02:04 +09:00 committed by Luca Boccassi
parent d42b81f93f
commit b5b2510800
2 changed files with 4 additions and 2 deletions

View file

@ -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);
}

View file

@ -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