- dtucker@cvs.openbsd.org 2005/01/17 22:48:39

     [sshd.c]
     Make debugging output continue after reexec; ok djm@

diff --git a/ChangeLog b/ChangeLog
index 2001cba6b2e212943229f1ddfe1743893f16c4b0..263f2e282e43b6528dc9606340e05ebee40fd733 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
    - dtucker@cvs.openbsd.org 2005/01/17 03:25:46
      [moduli.c]
      Correct spelling: SCHNOOR->SCHNORR; ok djm@
+   - dtucker@cvs.openbsd.org 2005/01/17 22:48:39
+     [sshd.c]
+     Make debugging output continue after reexec; ok djm@
 
 20050118
  - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement

diff --git a/sshd.c b/sshd.c
index 89f36a47436a5938050947726f3e8562a2713ad2..76aec80b0b5a7279c242396c0777d22623490bf4 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.305 2004/12/23 23:11:00 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.306 2005/01/17 22:48:39 dtucker Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1192,7 +1192,7 @@ main(int ac, char **av)
        }
 
        /* Initialize the log (it is reinitialized below in case we forked). */
-       if (debug_flag && !inetd_flag)
+       if (debug_flag && (!inetd_flag || rexeced_flag))
                log_stderr = 1;
        log_init(__progname, options.log_level, options.log_facility, log_stderr);