summaryrefslogtreecommitdiff
path: root/debian/patches/old-gssapi.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/old-gssapi.patch
parent8dcc7c5ef45cf5032dca7a308ffe17d3935e62d5 (diff)
DEP-3 tagging of GSSAPI patches; split old-gssapi.patch more appropriately
Diffstat (limited to 'debian/patches/old-gssapi.patch')
-rw-r--r--debian/patches/old-gssapi.patch41
1 files changed, 6 insertions, 35 deletions
diff --git a/debian/patches/old-gssapi.patch b/debian/patches/old-gssapi.patch
index 272654fd8..e2c4baa49 100644
--- a/debian/patches/old-gssapi.patch
+++ b/debian/patches/old-gssapi.patch
@@ -1,38 +1,9 @@
1Index: b/servconf.c 1Description: Interoperate with old GSSAPI authentication method
2=================================================================== 2 ssh-krb5 << 3.8.1p1-1 servers used a slightly different version.
3--- a/servconf.c 3Author: "Aaron M. Ucko" <ucko@debian.org>
4+++ b/servconf.c 4Bug-Debian: http://bugs.debian.org/328388
5@@ -375,16 +375,20 @@ 5Last-Updated: 2010-02-27
6 #ifdef GSSAPI 6
7 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
8 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
9+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
10 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
11 { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
12 { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
13 #else
14 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
15 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
16+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
17 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
18 { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
19 { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
20 #endif
21+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
22+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
23 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
24 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
25 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
26@@ -1620,7 +1624,9 @@
27 #endif
28 #ifdef GSSAPI
29 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
30+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
31 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
32+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
33 #endif
34 #ifdef JPAKE
35 dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication,
36Index: b/sshconnect2.c 7Index: b/sshconnect2.c
37=================================================================== 8===================================================================
38--- a/sshconnect2.c 9--- a/sshconnect2.c