diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-10-29 18:06:11 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-10-29 18:06:11 +0000 |
| commit | 10a255f6f0374988bd3de8557ae31effb3781709 (patch) | |
| tree | 106a9598893559fd6f4fbac2a83629b84e88fa65 /src/lib/rpc | |
| parent | 876c73baed2d98524d94f921b25b427c3bfd709a (diff) | |
| download | krb5-10a255f6f0374988bd3de8557ae31effb3781709.zip krb5-10a255f6f0374988bd3de8557ae31effb3781709.tar.gz krb5-10a255f6f0374988bd3de8557ae31effb3781709.tar.bz2 | |
* 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
Diffstat (limited to 'src/lib/rpc')
| -rw-r--r-- | src/lib/rpc/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/rpc/auth_gssapi.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index b3b643a..cfaf117 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 29 13:03:50 1996 Barry Jaspan <bjaspan@mit.edu> + + * 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 <tytso@mit.edu> * pmap_rmt.c: diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c index 2263512..01e7bff 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 |