summaryrefslogtreecommitdiff
path: root/debian/patches/gssapi-compat.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-02-27 18:08:33 +0000
committerColin Watson <cjwatson@debian.org>2010-02-27 18:08:33 +0000
commit56276d29ea829cd4c92cd881b496388d93c23dee (patch)
tree29ed53c0e3740b2fc2c138cb5b2a145412564b3b /debian/patches/gssapi-compat.patch
parent8dcc7c5ef45cf5032dca7a308ffe17d3935e62d5 (diff)
DEP-3 tagging of GSSAPI patches; split old-gssapi.patch more appropriately
Diffstat (limited to 'debian/patches/gssapi-compat.patch')
-rw-r--r--debian/patches/gssapi-compat.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/gssapi-compat.patch b/debian/patches/gssapi-compat.patch
new file mode 100644
index 000000000..773a10895
--- /dev/null
+++ b/debian/patches/gssapi-compat.patch
@@ -0,0 +1,30 @@
1Description: Compatibility with old GSSAPI option names
2 These options were supported by the old ssh-krb5 package in Debian.
3Author: Colin Watson <cjwatson@debian.org>
4Last-Updated: 2010-02-27
5
6Index: b/servconf.c
7===================================================================
8--- a/servconf.c
9+++ b/servconf.c
10@@ -375,16 +375,20 @@
11 #ifdef GSSAPI
12 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
13 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
14+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
15 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
16 { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
17 { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
18 #else
19 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
20 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
21+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
22 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
23 { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
24 { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
25 #endif
26+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
27+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
28 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
29 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
30 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },