service: fix units with more than one socket

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

diff --git a/TODO b/TODO
index f4aacacfb54e530f8d15073d5f71af2ddfeae9fd..f91d664f29f5a494bd3b1d99da4cedfe18092ac5 100644 (file)
--- 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 80c649f1c67d2f34a298f5c13292696014edc95d..d67916c249282699eb9215abcb230defc73833c4 100644 (file)
--- 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 728ca0b0180ece820552ad496eff21c227a09b41..a297cd911724540c75a1d98483139f1996559e2f 100644 (file)
--- 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);