From 9aee9711857783523ab717b298df87e345833894 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2024 15:54:28 +0100 Subject: [PATCH] tree-wide: use pidref_is_self() at more places --- src/basic/pidref.c | 2 +- src/libsystemd/sd-bus/test-bus-peersockaddr.c | 2 +- src/login/logind-dbus.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/pidref.c b/src/basic/pidref.c index b13cc96d6a1..5e4b3438c1b 100644 --- a/src/basic/pidref.c +++ b/src/basic/pidref.c @@ -429,7 +429,7 @@ int pidref_wait(const PidRef *pidref, siginfo_t *ret, int options) { if (pidref_is_remote(pidref)) return -EREMOTE; - if (pidref->pid == 1 || pidref->pid == getpid_cached()) + if (pidref->pid == 1 || pidref_is_self(pidref)) return -ECHILD; siginfo_t si = {}; diff --git a/src/libsystemd/sd-bus/test-bus-peersockaddr.c b/src/libsystemd/sd-bus/test-bus-peersockaddr.c index a7bba17a988..8b11a7af33d 100644 --- a/src/libsystemd/sd-bus/test-bus-peersockaddr.c +++ b/src/libsystemd/sd-bus/test-bus-peersockaddr.c @@ -81,7 +81,7 @@ static void *server(void *p) { _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL; assert_se(pidref_set_pidfd_take(&pidref, pidfd) >= 0); - assert_se(pidref.pid == getpid_cached()); + assert_se(pidref_is_self(&pidref)); } const gid_t *gl = NULL; diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 78b4783faa9..dce596eeb37 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -879,7 +879,7 @@ static int create_session( if (r < 0) return r; - if (leader.pid == 1 || leader.pid == getpid_cached()) + if (leader.pid == 1 || pidref_is_self(&leader)) return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid leader PID"); if (isempty(type)) -- 2.47.3