From 10a255f6f0374988bd3de8557ae31effb3781709 Mon Sep 17 00:00:00 2001 From: Barry Jaspan Date: Tue, 29 Oct 1996 18:06:11 +0000 Subject: [PATCH] * auth_gssapi.c (auth_gssapi_create): #ifdef GSSAPI_KRB5, a null mech_type implies gss_mech_krb5, so include that in the version 3 fallback test. This change, along with the other changes for rpc version 4, complete the fix for [krb5-libs/106]. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9246 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/rpc/ChangeLog | 7 +++++++ src/lib/rpc/auth_gssapi.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index b3b643a3a..cfaf11721 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 29 13:03:50 1996 Barry Jaspan + + * auth_gssapi.c (auth_gssapi_create): #ifdef GSSAPI_KRB5, a null + mech_type implies gss_mech_krb5, so include that in the version 3 + fallback test. This change, along with the other changes for rpc + version 4, complete the fix for [krb5-libs/106]. + Wed Oct 23 00:08:27 1996 Theodore Y. Ts'o * pmap_rmt.c: diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c index 2263512cb..01e7bffe9 100644 --- a/src/lib/rpc/auth_gssapi.c +++ b/src/lib/rpc/auth_gssapi.c @@ -224,7 +224,8 @@ try_new_version: * the beta 7 server it will be accepted. Not ideal, but it * works. */ - if (call_arg.version < 4 && mech_type == gss_mech_krb5) + if (call_arg.version < 4 && (mech_type == gss_mech_krb5 || + mech_type == GSS_C_NULL_OID)) mech_type = gss_mech_krb5_old; #endif -- 2.26.2