summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 925239349..33a2aaf4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 - dtucker@cvs.openbsd.org 2005/01/17 03:25:46 19 - dtucker@cvs.openbsd.org 2005/01/17 03:25:46
20 [moduli.c] 20 [moduli.c]
21 Correct spelling: SCHNOOR->SCHNORR; ok djm@ 21 Correct spelling: SCHNOOR->SCHNORR; ok djm@
22 - dtucker@cvs.openbsd.org 2005/01/17 22:48:39
23 [sshd.c]
24 Make debugging output continue after reexec; ok djm@
22 25
2320050118 2620050118
24 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement 27 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
@@ -1991,4 +1994,4 @@
1991 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1994 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1992 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1995 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1993 1996
1994$Id: ChangeLog,v 1.3614 2005/01/20 00:02:26 dtucker Exp $ 1997$Id: ChangeLog,v 1.3615 2005/01/20 00:03:08 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 89f36a474..76aec80b0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.305 2004/12/23 23:11:00 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.306 2005/01/17 22:48:39 dtucker Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -1192,7 +1192,7 @@ main(int ac, char **av)
1192 } 1192 }
1193 1193
1194 /* Initialize the log (it is reinitialized below in case we forked). */ 1194 /* Initialize the log (it is reinitialized below in case we forked). */
1195 if (debug_flag && !inetd_flag) 1195 if (debug_flag && (!inetd_flag || rexeced_flag))
1196 log_stderr = 1; 1196 log_stderr = 1;
1197 log_init(__progname, options.log_level, options.log_facility, log_stderr); 1197 log_init(__progname, options.log_level, options.log_facility, log_stderr);
1198 1198