From 56276d29ea829cd4c92cd881b496388d93c23dee Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 27 Feb 2010 18:08:33 +0000 Subject: DEP-3 tagging of GSSAPI patches; split old-gssapi.patch more appropriately --- debian/patches/old-gssapi.patch | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) (limited to 'debian/patches/old-gssapi.patch') 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 @@ -Index: b/servconf.c -=================================================================== ---- a/servconf.c -+++ b/servconf.c -@@ -375,16 +375,20 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL }, - { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, - { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, - { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL }, - { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, - { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, - { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, - #endif -+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL }, - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, - { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, -@@ -1620,7 +1624,9 @@ - #endif - #ifdef GSSAPI - dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); -+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); - dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); -+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); - #endif - #ifdef JPAKE - dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, +Description: Interoperate with old GSSAPI authentication method + ssh-krb5 << 3.8.1p1-1 servers used a slightly different version. +Author: "Aaron M. Ucko" +Bug-Debian: http://bugs.debian.org/328388 +Last-Updated: 2010-02-27 + Index: b/sshconnect2.c =================================================================== --- a/sshconnect2.c -- cgit v1.2.3