- 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@

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 26abc8812..73be25d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
    - dtucker@cvs.openbsd.org 2004/08/11 11:09:54
      [servconf.c]
      Fix minor leak; "looks right" deraadt@
+   - 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@
 
 20040720
  - (djm) OpenBSD CVS Sync
@@ -1582,4 +1585,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3493 2004/08/12 12:41:44 dtucker Exp $
+$Id: ChangeLog,v 1.3494 2004/08/12 12:42:29 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index cc051432f..e3acbcc81 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);