diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-07-29 16:36:15 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-10-27 17:56:36 +0200 |
| commit | c85cb3bc7f00e857ea90e374b916b2fd7eb773ec (patch) | |
| tree | 93396072e42ab76d0420d06667934b1467134622 /src/basic/process-util.c | |
| parent | e7e7c07c50d980a4494b101a2b1b5e6126c7940f (diff) | |
| download | systemd-c85cb3bc7f00e857ea90e374b916b2fd7eb773ec.tar.gz | |
Revert "basic/fd-util: sort the 'except' array in place"
This reverts commit 9c46228b7deb53d6384545535b37b2844a102b2b.
Diffstat (limited to 'src/basic/process-util.c')
| -rw-r--r-- | src/basic/process-util.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c index fef0c742c7..5c56a59aab 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1246,7 +1246,7 @@ static void restore_sigsetp(sigset_t **ssp) { int safe_fork_full( const char *name, - int except_fds[], + const int except_fds[], size_t n_except_fds, ForkFlags flags, pid_t *ret_pid) { @@ -1441,7 +1441,7 @@ int safe_fork_full( int namespace_fork( const char *outer_name, const char *inner_name, - int except_fds[], + const int except_fds[], size_t n_except_fds, ForkFlags flags, int pidns_fd, @@ -1457,8 +1457,7 @@ int namespace_fork( * process. This ensures that we are fully a member of the destination namespace, with pidns an all, so that * /proc/self/fd works correctly. */ - r = safe_fork_full(outer_name, except_fds, n_except_fds, - (flags|FORK_DEATHSIG) & ~(FORK_REOPEN_LOG|FORK_NEW_MOUNTNS|FORK_MOUNTNS_SLAVE), ret_pid); + r = safe_fork_full(outer_name, except_fds, n_except_fds, (flags|FORK_DEATHSIG) & ~(FORK_REOPEN_LOG|FORK_NEW_MOUNTNS|FORK_MOUNTNS_SLAVE), ret_pid); if (r < 0) return r; if (r == 0) { |