summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 79594ab20..c37cd63f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,9 @@
71 [monitor.c monitor_wrap.c] 71 [monitor.c monitor_wrap.c]
72 fix permitrootlogin forced-commands-only for privsep; bux #387; 72 fix permitrootlogin forced-commands-only for privsep; bux #387;
73 ok provos@ 73 ok provos@
74 - markus@cvs.openbsd.org 2003/02/21 09:05:53
75 [servconf.c]
76 print sshd_config filename in debug2 mode.
74 77
7520030211 7820030211
76 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com 79 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1171,4 +1174,4 @@
1171 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1174 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1172 ok provos@ 1175 ok provos@
1173 1176
1174$Id: ChangeLog,v 1.2613 2003/02/24 01:03:38 djm Exp $ 1177$Id: ChangeLog,v 1.2614 2003/02/24 01:04:33 djm Exp $
diff --git a/servconf.c b/servconf.c
index e3939df40..2510659ee 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.116 2003/02/21 09:05:53 markus Exp $");
14 14
15#if defined(KRB4) 15#if defined(KRB4)
16#include <krb.h> 16#include <krb.h>
@@ -935,6 +935,7 @@ read_server_config(ServerOptions *options, const char *filename)
935 char line[1024]; 935 char line[1024];
936 FILE *f; 936 FILE *f;
937 937
938 debug2("read_server_config: filename %s", filename);
938 f = fopen(filename, "r"); 939 f = fopen(filename, "r");
939 if (!f) { 940 if (!f) {
940 perror(filename); 941 perror(filename);