From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 27 Feb 2024 17:32:51 +0000 (+0100)
Subject: shared/pam-util: fix awkward tense in log message
X-Git-Tag: v256-rc1~719^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7364e1a51e79b113b5cad5bb142be19f72617b7;p=thirdparty%2Fsystemd.git

shared/pam-util: fix awkward tense in log message
---

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