X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket.c;h=3a7aa94036d6123ab16c9cc7306f5af71b6a08f4;hp=8b78a3fd25a0644d961feef1284fcb212370ec56;hb=3611581ebdabbe3a1d6a9b5310a0b59792279d7d;hpb=ee17ee7c5cc22c286f943578918beaa78bbc86db;ds=sidebyside

diff --git a/src/socket.c b/src/socket.c
index 8b78a3fd2..3a7aa9403 100644
--- 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;
         }
 
-        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)))
@@ -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 (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
+                        if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
                                 r = q;
         }