diff options
author | Damien Miller <djm@mindrot.org> | 2009-01-28 16:27:31 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-01-28 16:27:31 +1100 |
commit | 5bc6aae3dbeda2e6b23361238b16fbadbfcd2ce5 (patch) | |
tree | d886761e3ec162d39be685c97e34f102ea5a73d0 | |
parent | 1781f53d7540778fa50991d9b5aaf8f4b4a2eafd (diff) |
- stevesk@cvs.openbsd.org 2009/01/15 17:38:43
[readconf.c]
1) use obsolete instead of alias for consistency
2) oUserKnownHostsFile not obsolete but oGlobalKnownHostsFile2 is
so move the comment.
3) reorder so like options are together
ok djm@
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | readconf.c | 8 |
2 files changed, 12 insertions, 5 deletions
@@ -46,6 +46,13 @@ | |||
46 | [channels.c] | 46 | [channels.c] |
47 | support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482; | 47 | support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482; |
48 | "looks ok" markus@ | 48 | "looks ok" markus@ |
49 | - stevesk@cvs.openbsd.org 2009/01/15 17:38:43 | ||
50 | [readconf.c] | ||
51 | 1) use obsolete instead of alias for consistency | ||
52 | 2) oUserKnownHostsFile not obsolete but oGlobalKnownHostsFile2 is | ||
53 | so move the comment. | ||
54 | 3) reorder so like options are together | ||
55 | ok djm@ | ||
49 | 56 | ||
50 | 20090107 | 57 | 20090107 |
51 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. | 58 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
@@ -5055,5 +5062,5 @@ | |||
5055 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5062 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5056 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5063 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5057 | 5064 | ||
5058 | $Id: ChangeLog,v 1.5171 2009/01/28 05:24:41 djm Exp $ | 5065 | $Id: ChangeLog,v 1.5172 2009/01/28 05:27:31 djm Exp $ |
5059 | 5066 | ||
diff --git a/readconf.c b/readconf.c index ab89e0c05..f63a00c47 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.173 2008/12/09 02:58:16 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.174 2009/01/15 17:38:43 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 |
@@ -172,7 +172,7 @@ static struct { | |||
172 | { "fallbacktorsh", oDeprecated }, | 172 | { "fallbacktorsh", oDeprecated }, |
173 | { "usersh", oDeprecated }, | 173 | { "usersh", oDeprecated }, |
174 | { "identityfile", oIdentityFile }, | 174 | { "identityfile", oIdentityFile }, |
175 | { "identityfile2", oIdentityFile }, /* alias */ | 175 | { "identityfile2", oIdentityFile }, /* obsolete */ |
176 | { "identitiesonly", oIdentitiesOnly }, | 176 | { "identitiesonly", oIdentitiesOnly }, |
177 | { "hostname", oHostName }, | 177 | { "hostname", oHostName }, |
178 | { "hostkeyalias", oHostKeyAlias }, | 178 | { "hostkeyalias", oHostKeyAlias }, |
@@ -188,8 +188,8 @@ static struct { | |||
188 | { "host", oHost }, | 188 | { "host", oHost }, |
189 | { "escapechar", oEscapeChar }, | 189 | { "escapechar", oEscapeChar }, |
190 | { "globalknownhostsfile", oGlobalKnownHostsFile }, | 190 | { "globalknownhostsfile", oGlobalKnownHostsFile }, |
191 | { "userknownhostsfile", oUserKnownHostsFile }, /* obsolete */ | 191 | { "globalknownhostsfile2", oGlobalKnownHostsFile2 }, /* obsolete */ |
192 | { "globalknownhostsfile2", oGlobalKnownHostsFile2 }, | 192 | { "userknownhostsfile", oUserKnownHostsFile }, |
193 | { "userknownhostsfile2", oUserKnownHostsFile2 }, /* obsolete */ | 193 | { "userknownhostsfile2", oUserKnownHostsFile2 }, /* obsolete */ |
194 | { "connectionattempts", oConnectionAttempts }, | 194 | { "connectionattempts", oConnectionAttempts }, |
195 | { "batchmode", oBatchMode }, | 195 | { "batchmode", oBatchMode }, |