diff options
author | Damien Miller <djm@mindrot.org> | 2003-09-02 22:57:27 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-09-02 22:57:27 +1000 |
commit | 84d03efdf7715eaeacc46abf3c9dc0a210a0bbbe (patch) | |
tree | 08170d5551204d7572453e81d9fc8774d32a4c63 | |
parent | 9b7b03b27084f0d7fca3caefc956d5c4c02e6928 (diff) |
- markus@cvs.openbsd.org 2003/09/01 12:50:46
[readconf.c]
rm gssapidelegatecreds alias; never supported before
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -35,6 +35,9 @@ | |||
35 | - markus@cvs.openbsd.org 2003/09/01 09:50:04 | 35 | - markus@cvs.openbsd.org 2003/09/01 09:50:04 |
36 | [sshd_config.5] | 36 | [sshd_config.5] |
37 | gss kex is not supported; sxw@inf.ed.ac.uk | 37 | gss kex is not supported; sxw@inf.ed.ac.uk |
38 | - markus@cvs.openbsd.org 2003/09/01 12:50:46 | ||
39 | [readconf.c] | ||
40 | rm gssapidelegatecreds alias; never supported before | ||
38 | 41 | ||
39 | 20030829 | 42 | 20030829 |
40 | - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our | 43 | - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our |
@@ -950,4 +953,4 @@ | |||
950 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 953 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
951 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 954 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
952 | 955 | ||
953 | $Id: ChangeLog,v 1.2929 2003/09/02 12:57:05 djm Exp $ | 956 | $Id: ChangeLog,v 1.2930 2003/09/02 12:57:27 djm Exp $ |
diff --git a/readconf.c b/readconf.c index 281b66872..d7ef58936 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.119 2003/08/28 12:54:34 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.120 2003/09/01 12:50:46 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -137,7 +137,6 @@ static struct { | |||
137 | { "afstokenpassing", oUnsupported }, | 137 | { "afstokenpassing", oUnsupported }, |
138 | #if defined(GSSAPI) | 138 | #if defined(GSSAPI) |
139 | { "gssapiauthentication", oGssAuthentication }, | 139 | { "gssapiauthentication", oGssAuthentication }, |
140 | { "gssapidelegatecreds", oGssDelegateCreds }, | ||
141 | { "gssapidelegatecredentials", oGssDelegateCreds }, | 140 | { "gssapidelegatecredentials", oGssDelegateCreds }, |
142 | #else | 141 | #else |
143 | { "gssapiauthentication", oUnsupported }, | 142 | { "gssapiauthentication", oUnsupported }, |