diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -103,6 +103,9 @@ | |||
103 | - stevesk@cvs.openbsd.org 2008/11/03 01:07:02 | 103 | - stevesk@cvs.openbsd.org 2008/11/03 01:07:02 |
104 | [readconf.c] | 104 | [readconf.c] |
105 | remove valueless comment | 105 | remove valueless comment |
106 | - stevesk@cvs.openbsd.org 2008/11/03 02:44:41 | ||
107 | [readconf.c] | ||
108 | fix comment | ||
106 | 109 | ||
107 | 20080906 | 110 | 20080906 |
108 | - (dtucker) [config.guess config.sub] Update to latest versions from | 111 | - (dtucker) [config.guess config.sub] Update to latest versions from |
@@ -4837,4 +4840,4 @@ | |||
4837 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4840 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4838 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4841 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4839 | 4842 | ||
4840 | $Id: ChangeLog,v 1.5124 2008/11/03 08:28:07 djm Exp $ | 4843 | $Id: ChangeLog,v 1.5125 2008/11/03 08:28:21 djm Exp $ |
diff --git a/readconf.c b/readconf.c index e61486b09..7f7bbfee2 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.169 2008/11/03 01:07:02 stevesk Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.170 2008/11/03 02:44:41 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 |
@@ -1225,7 +1225,7 @@ parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd) | |||
1225 | if ((fwdarg[i] = hpdelim(&cp)) == NULL) | 1225 | if ((fwdarg[i] = hpdelim(&cp)) == NULL) |
1226 | break; | 1226 | break; |
1227 | 1227 | ||
1228 | /* Check for trailing garbage in 4-arg case*/ | 1228 | /* Check for trailing garbage */ |
1229 | if (cp != NULL) | 1229 | if (cp != NULL) |
1230 | i = 0; /* failure */ | 1230 | i = 0; /* failure */ |
1231 | 1231 | ||