summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--readconf.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3054499ad..a64eff3fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,9 @@
100 [ttymodes.c] 100 [ttymodes.c]
101 protocol 2 tty modes support is now 7.5 years old so remove these 101 protocol 2 tty modes support is now 7.5 years old so remove these
102 debug3()s; ok deraadt@ 102 debug3()s; ok deraadt@
103 - stevesk@cvs.openbsd.org 2008/11/03 01:07:02
104 [readconf.c]
105 remove valueless comment
103 106
10420080906 10720080906
105 - (dtucker) [config.guess config.sub] Update to latest versions from 108 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4834,4 +4837,4 @@
4834 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4837 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4835 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4838 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4836 4839
4837$Id: ChangeLog,v 1.5123 2008/11/03 08:27:52 djm Exp $ 4840$Id: ChangeLog,v 1.5124 2008/11/03 08:28:07 djm Exp $
diff --git a/readconf.c b/readconf.c
index 27be8df68..e61486b09 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.168 2008/11/01 17:40:33 stevesk Exp $ */ 1/* $OpenBSD: readconf.c,v 1.169 2008/11/03 01:07:02 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -942,7 +942,6 @@ read_config_file(const char *filename, const char *host, Options *options,
942 int active, linenum; 942 int active, linenum;
943 int bad_options = 0; 943 int bad_options = 0;
944 944
945 /* Open the file. */
946 if ((f = fopen(filename, "r")) == NULL) 945 if ((f = fopen(filename, "r")) == NULL)
947 return 0; 946 return 0;
948 947