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 e922dde4d..f3ca4cfcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
22 - markus@cvs.openbsd.org 2002/11/05 20:10:37 22 - markus@cvs.openbsd.org 2002/11/05 20:10:37
23 [sftp-client.c] 23 [sftp-client.c]
24 typo; GaryF@livevault.com 24 typo; GaryF@livevault.com
25 - markus@cvs.openbsd.org 2002/11/07 16:28:47
26 [sshd.c]
27 log to stderr if -ie is given, bug #414, prj@po.cwru.edu
25 28
2620021021 2920021021
27 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 30 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@@ -799,4 +802,4 @@
799 save auth method before monitor_reset_key_state(); bugzilla bug #284; 802 save auth method before monitor_reset_key_state(); bugzilla bug #284;
800 ok provos@ 803 ok provos@
801 804
802$Id: ChangeLog,v 1.2506 2002/11/09 15:48:49 mouring Exp $ 805$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 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.260 2002/09/27 10:42:09 mickey Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.261 2002/11/07 16:28:47 markus Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -944,7 +944,7 @@ main(int ac, char **av)
944 SYSLOG_LEVEL_INFO : options.log_level, 944 SYSLOG_LEVEL_INFO : options.log_level,
945 options.log_facility == SYSLOG_FACILITY_NOT_SET ? 945 options.log_facility == SYSLOG_FACILITY_NOT_SET ?
946 SYSLOG_FACILITY_AUTH : options.log_facility, 946 SYSLOG_FACILITY_AUTH : options.log_facility,
947 !inetd_flag); 947 log_stderr || !inetd_flag);
948 948
949#ifdef _UNICOS 949#ifdef _UNICOS
950 /* Cray can define user privs drop all prives now! 950 /* Cray can define user privs drop all prives now!