diff options
author | Lennart Poettering <lennart@poettering.net> | 2011-04-06 02:25:39 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2011-04-06 02:25:39 +0200 |
commit | 9c1b183c709b90e735b60294d7be00b37814645a (patch) | |
tree | e99ae5f89f081d4cc143bdbfee44b5599a32d074 /src | |
parent | 82e23dddebc79245ccd8333f229aa37975f81b6a (diff) |
service: fix units with more than one socket
https://bugzilla.redhat.com/show_bug.cgi?id=693289
Diffstat (limited to 'src')
-rw-r--r-- | src/execute.c | 2 | ||||
-rw-r--r-- | src/service.c | 4 |
2 files changed, 3 insertions, 3 deletions
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); |