diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/execute.c | 2 | ||||
| -rw-r--r-- | src/service.c | 4 |
3 files changed, 3 insertions, 5 deletions
@@ -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 80c649f1c6..d67916c249 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 728ca0b018..a297cd9117 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); |