diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2004-08-11 11:50:10 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2004-08-11 11:50:10 +0000 |
| commit | 45ab9110bca28bbce60ee7b7dbef43d2b31996db (patch) | |
| tree | 450db788ad0f22275eb6b06d15550d96ec4d9f50 | |
| parent | 72087139f698f4b0ee90bf649b43e2d90959f994 (diff) | |
Don't try to close startup_pipe if it's not open; ok djm@
| -rw-r--r-- | usr.bin/ssh/sshd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 0ed454b320e..191797c81a6 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.300 2004/07/28 08:56:22 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.301 2004/08/11 11:50:09 dtucker Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -1508,7 +1508,8 @@ main(int ac, char **av) dup2(config_s[1], REEXEC_CONFIG_PASS_FD); close(config_s[1]); - close(startup_pipe); + if (startup_pipe != -1) + close(startup_pipe); execv(rexec_argv[0], rexec_argv); |