diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-12-10 01:29:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-10 01:29:52 -0500 |
| commit | 1ac7a935740662bffd89eefc6655e459181188b1 (patch) | |
| tree | 7f846741c7c23d8949ae9abef26dbec34ad1ce47 /src/core/socket.c | |
| parent | 4a5567d5d6ab01974dd089eb8907fecd6aff4fcf (diff) | |
| parent | 03fc9c723cfc59467a7fccc305f34273f8564b25 (diff) | |
Merge pull request #4835 from poettering/unit-name-printf
Various specifier resolution fixes.
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 1a53d47f21..fee9b702e6 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -54,7 +54,6 @@ #include "string-util.h" #include "strv.h" #include "unit-name.h" -#include "unit-printf.h" #include "unit.h" #include "user-util.h" #include "in-addr-util.h" @@ -1740,7 +1739,6 @@ static int socket_coldplug(Unit *u) { } static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) { - _cleanup_free_ char **argv = NULL; pid_t pid; int r; ExecParameters exec_params = { @@ -1772,11 +1770,7 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) { if (r < 0) return r; - r = unit_full_printf_strv(UNIT(s), c->argv, &argv); - if (r < 0) - return r; - - exec_params.argv = argv; + exec_params.argv = c->argv; exec_params.environment = UNIT(s)->manager->environment; exec_params.confirm_spawn = manager_get_confirm_spawn(UNIT(s)->manager); exec_params.cgroup_supported = UNIT(s)->manager->cgroup_supported; |