From f7364e1a51e79b113b5cad5bb142be19f72617b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 27 Feb 2024 18:32:51 +0100 Subject: [PATCH] shared/pam-util: fix awkward tense in log message --- src/shared/pam-util.c | 2 +- test/units/end.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c index e3d92038aa8..d626b2817bc 100644 --- a/src/shared/pam-util.c +++ b/src/shared/pam-util.c @@ -97,7 +97,7 @@ static void pam_bus_data_destroy(pam_handle_t *handle, void *data, int error_sta 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 (%s) after fork whose connection is opened before the fork, this should not happen.", + "Warning: cannot close sd-bus connection (%s) after fork when it was opened before the fork.", strna(d->cache_id)); pam_bus_data_free(data); diff --git a/test/units/end.sh b/test/units/end.sh index 412e0a96a2f..4c6c0afa0e9 100755 --- a/test/units/end.sh +++ b/test/units/end.sh @@ -6,8 +6,8 @@ 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) +# Here, the redundant '[ ]' in the pattern is required in order not to match the logged command itself. +(! journalctl -q -o short-monotonic --grep 'Warning: cannot close sd-bus connection[ ].*after fork' >>/failed) systemctl poweroff --no-block exit 0 -- 2.47.3