diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-07 18:55:39 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-21 07:39:18 +0900 |
| commit | 0c2aedb451c9da0d997e46c84d399c80d7fcb61d (patch) | |
| tree | 594f8797a9bf7786406c3c0af349a8c6dca4f333 /src/resolve | |
| parent | 911f8f0183ef723737de3661b1dd042c7b2fcb6e (diff) | |
| download | systemd-0c2aedb451c9da0d997e46c84d399c80d7fcb61d.tar.gz | |
tree-wide: use FORK_REARRANGE_STDIO and FORK_CLOSE_ALL_FDS
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/test-resolved-stream.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/resolve/test-resolved-stream.c b/src/resolve/test-resolved-stream.c index d7fe3c42f5..ae851f67f0 100644 --- a/src/resolve/test-resolved-stream.c +++ b/src/resolve/test-resolved-stream.c @@ -148,17 +148,13 @@ static void *tls_dns_server(void *p) { } r = safe_fork_full("(test-resolved-stream-tls-openssl)", - NULL, - (int[]) { fd_server, fd_tls }, 2, - FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG|FORK_LOG|FORK_REOPEN_LOG, &openssl_pid); + (int[]) { fd_tls, fd_tls, STDOUT_FILENO }, + NULL, 0, + FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG|FORK_REARRANGE_STDIO|FORK_LOG|FORK_REOPEN_LOG, + &openssl_pid); assert_se(r >= 0); if (r == 0) { /* Child */ - assert_se(dup2(fd_tls, STDIN_FILENO) >= 0); - assert_se(dup2(fd_tls, STDOUT_FILENO) >= 0); - close(TAKE_FD(fd_server)); - close(TAKE_FD(fd_tls)); - execlp("openssl", "openssl", "s_server", "-accept", bind_str, "-key", key_path, "-cert", cert_path, "-quiet", "-naccept", "1", NULL); |