tree-wide: use pidref_is_self() at more places

diff --git a/src/basic/pidref.c b/src/basic/pidref.c
index b13cc96d6a1f59d0f0afab9b7c254fc93291c9de..5e4b3438c1bc1c30564044619f17f3d63a8f4962 100644 (file)
--- 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 a7bba17a9884a60064dbdb20ea63405b855b440b..8b11a7af33d639bf45e79d9371b29ad11082e521 100644 (file)
--- 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 78b4783faa9fbe5c8257718cdc637fd002bde5dd..dce596eeb370e97a0e321648b93ed113ef5bbe4c 100644 (file)
--- 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))