diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2013-10-10 01:43:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2013-10-10 01:43:04 +0000 |
| commit | 45f979f073c52c622097e7514731417aa379cb4c (patch) | |
| tree | bbb0f0f54280ae4cafe043bb2ad5209c380fd205 | |
| parent | 7ac682889bd1835afb5b5cd771a1a7f196fe5833 (diff) | |
bz#2139: fix re-exec fallback by ensuring that startup_pipe is correctly
updated; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/sshd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index fabeb7d9493..590a8e87aca 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.406 2013/09/02 22:00:34 deraadt Exp $ */ +/* $OpenBSD: sshd.c,v 1.407 2013/10/10 01:43:03 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1826,13 +1826,14 @@ main(int ac, char **av) dup2(STDIN_FILENO, STDOUT_FILENO); if (startup_pipe == -1) close(REEXEC_STARTUP_PIPE_FD); - else + else if (startup_pipe != REEXEC_STARTUP_PIPE_FD) { dup2(startup_pipe, REEXEC_STARTUP_PIPE_FD); + close(startup_pipe); + startup_pipe = REEXEC_STARTUP_PIPE_FD; + } dup2(config_s[1], REEXEC_CONFIG_PASS_FD); close(config_s[1]); - if (startup_pipe != -1) - close(startup_pipe); execv(rexec_argv[0], rexec_argv); @@ -1843,8 +1844,6 @@ main(int ac, char **av) options.log_facility, log_stderr); /* Clean up fds */ - startup_pipe = REEXEC_STARTUP_PIPE_FD; - close(config_s[1]); close(REEXEC_CONFIG_PASS_FD); newsock = sock_out = sock_in = dup(STDIN_FILENO); if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { |