From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Apr 2011 00:25:39 +0000 (+0200)
Subject: service: fix units with more than one socket
X-Git-Tag: v24~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9c1b183c709b90e735b60294d7be00b37814645a;hp=82e23dddebc79245ccd8333f229aa37975f81b6a

service: fix units with more than one socket

https://bugzilla.redhat.com/show_bug.cgi?id=693289
---

diff --git a/TODO b/TODO
index f4aacacfb..f91d664f2 100644
--- a/TODO
+++ b/TODO
@@ -21,8 +21,6 @@ F15:
 
 * fix alsa mixer restore to not print error when no config is stored
 
-* disable most systemctl verbs in chroot()s
-
 Features:
 
 * don't trim empty cgroups
diff --git a/src/execute.c b/src/execute.c
index 80c649f1c..d67916c24 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -981,7 +981,7 @@ int exec_spawn(ExecCommand *command,
 
                 /* This string must fit in 10 chars (i.e. the length
                  * of "/sbin/init") */
-                rename_process("sd:exec");
+                rename_process("sd.exec");
 
                 /* We reset exactly these signals, since they are the
                  * only ones we set to SIG_IGN in the main daemon. All
diff --git a/src/service.c b/src/service.c
index 728ca0b01..a297cd911 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1592,8 +1592,8 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
                                 goto fail;
                         }
 
-                        memcpy(t, rfds, rn_fds);
-                        memcpy(t+rn_fds, cfds, cn_fds);
+                        memcpy(t, rfds, rn_fds * sizeof(int));
+                        memcpy(t+rn_fds, cfds, cn_fds * sizeof(int));
                         free(rfds);
                         free(cfds);