service: properly handle who argument on D-Bus kill calls

diff --git a/src/mount.c b/src/mount.c
index 660af131dc6312cbaaf891a6df0b99f22da8e893..d837041475ac1ac762e3dbfe6fc097798a1369af 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -1777,11 +1777,12 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
                 return -ENOENT;
         }
 
                 return -ENOENT;
         }
 

-        if (m->control_pid > 0)
-                if (kill(m->control_pid, signo) < 0)
-                        r = -errno;
+        if (who == KILL_CONTROL || who == KILL_ALL)
+                if (m->control_pid > 0)
+                        if (kill(m->control_pid, signo) < 0)
+                                r = -errno;

 
 

-        if (mode == KILL_CONTROL_GROUP) {
+        if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {

                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))


@@ -1795,7 +1796,7 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
                         }
 
                 if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         }
 
                 if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)

-                        if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+                        if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)

                                 r = q;
         }
 
                                 r = q;
         }
 

diff --git a/src/service.c b/src/service.c
index b684a37cd753f1e748f25009faddad13c9122575..0b657679f7391fe4f630ba1f0e48f2dd46f10af8 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -3270,15 +3270,17 @@ static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusErro
                 return -ENOENT;
         }
 
                 return -ENOENT;
         }
 

-        if (s->control_pid > 0)
-                if (kill(s->control_pid, signo) < 0)
-                        r = -errno;
+        if (who == KILL_CONTROL || who == KILL_ALL)
+                if (s->control_pid > 0)
+                        if (kill(s->control_pid, signo) < 0)
+                                r = -errno;

 
 

-        if (s->main_pid > 0)
-                if (kill(s->main_pid, signo) < 0)
-                        r = -errno;
+        if (who == KILL_MAIN || who == KILL_ALL)
+                if (s->main_pid > 0)
+                        if (kill(s->main_pid, signo) < 0)
+                                r = -errno;

 
 

-        if (mode == KILL_CONTROL_GROUP) {
+        if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {

                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))


@@ -3298,7 +3300,7 @@ static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusErro
                         }
 
                 if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         }
 
                 if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)

-                        if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+                        if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)

                                 r = q;
         }
 
                                 r = q;
         }
 

diff --git a/src/socket.c b/src/socket.c
index 8b78a3fd25a0644d961feef1284fcb212370ec56..3a7aa94036d6123ab16c9cc7306f5af71b6a08f4 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -2030,11 +2030,12 @@ static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
                 return -ENOENT;
         }
 
                 return -ENOENT;
         }
 

-        if (s->control_pid > 0)
-                if (kill(s->control_pid, signo) < 0)
-                        r = -errno;
+        if (who == KILL_CONTROL || who == KILL_ALL)
+                if (s->control_pid > 0)
+                        if (kill(s->control_pid, signo) < 0)
+                                r = -errno;

 
 

-        if (mode == KILL_CONTROL_GROUP) {
+        if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {

                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))


@@ -2048,7 +2049,7 @@ static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
                         }
 
                 if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         }
 
                 if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)

-                        if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+                        if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)

                                 r = q;
         }
 
                                 r = q;
         }
 

diff --git a/src/swap.c b/src/swap.c
index 7675e6af21c9e10c5bcc89acb8c633a250e0db45..a0b16776457e0c887964c1aa24df112236e61d76 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -1286,11 +1286,12 @@ static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
                 return -ENOENT;
         }
 
                 return -ENOENT;
         }
 

-        if (s->control_pid > 0)
-                if (kill(s->control_pid, signo) < 0)
-                        r = -errno;
+        if (who == KILL_CONTROL || who == KILL_ALL)
+                if (s->control_pid > 0)
+                        if (kill(s->control_pid, signo) < 0)
+                                r = -errno;

 
 

-        if (mode == KILL_CONTROL_GROUP) {
+        if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {

                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
                 int q;
 
                 if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))


@@ -1304,7 +1305,7 @@ static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
                         }
 
                 if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         }
 
                 if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)

-                        if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+                        if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)

                                 r = q;
         }
 
                                 r = q;
         }