summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-08-12 22:42:29 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-08-12 22:42:29 +1000
commitd8835934c4cf129b842b0f391783754cdaa0190c (patch)
tree1e2d947c4d0e3e3f70b01d843ef9e19eb0b80799 /sshd.c
parent9fbac719055b66ef2bcd9b4cc98163cd97d829bc (diff)
downloadopenssh-git-d8835934c4cf129b842b0f391783754cdaa0190c.tar.gz
- dtucker@cvs.openbsd.org 2004/08/11 11:50:09
[sshd.c] Don't try to close startup_pipe if it's not open; ok djm@
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index cc051432..e3acbcc8 100644
--- a/sshd.c
+++ b/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>
@@ -1577,7 +1577,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);