2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e922dde4d..f3ca4cfcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
    - markus@cvs.openbsd.org 2002/11/05 20:10:37
      [sftp-client.c]
      typo; GaryF@livevault.com
+   - markus@cvs.openbsd.org 2002/11/07 16:28:47
+     [sshd.c]
+     log to stderr if -ie is given, bug #414, prj@po.cwru.edu
 
 20021021
  - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 
@@ -799,4 +802,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2506 2002/11/09 15:48:49 mouring Exp $
+$Id: ChangeLog,v 1.2507 2002/11/09 15:50:03 mouring Exp $
diff --git a/sshd.c b/sshd.c
index f8bd7ce54..8bf1557a2 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.260 2002/09/27 10:42:09 mickey Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.261 2002/11/07 16:28:47 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -944,7 +944,7 @@ main(int ac, char **av)
             SYSLOG_LEVEL_INFO : options.log_level,
             options.log_facility == SYSLOG_FACILITY_NOT_SET ?
             SYSLOG_FACILITY_AUTH : options.log_facility,
-            !inetd_flag);
+            log_stderr || !inetd_flag);
 
 #ifdef _UNICOS
         /* Cray can define user privs drop all prives now!