diff options
| author | Sam Hartman <hartmans@mit.edu> | 1996-02-01 22:01:13 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 1996-02-01 22:01:13 +0000 |
| commit | 88e2cb936470abacee1c70fd52b34ccaa7180855 (patch) | |
| tree | 57221b5add046a535c89a45c39c0cfb13b30102f /src/lib/krb5/ccache/stdio | |
| parent | 5fd0c388d114916e6d775e8f9ba40d95a6a2dc12 (diff) | |
| download | krb5-88e2cb936470abacee1c70fd52b34ccaa7180855.tar.gz krb5-88e2cb936470abacee1c70fd52b34ccaa7180855.tar.xz krb5-88e2cb936470abacee1c70fd52b34ccaa7180855.zip | |
Remove check to make sure ticket enctype
is in the tgs enctypes.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7431 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/ccache/stdio')
| -rw-r--r-- | src/lib/krb5/ccache/stdio/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/stdio/scc_retrv.c | 26 |
2 files changed, 5 insertions, 25 deletions
diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index 1b3e55b979..072fe2b24d 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 1 15:50:29 1996 Sam Hartman <hartmans@tertius.mit.edu> + + * scc_retrv.c (krb5_scc_retrieve): Accept any enctype unless doing a specific match. + Thu Jan 25 14:44:48 1996 Sam Hartman <hartmans@tertius.mit.edu> * scc_retrv.c (ktype_reasonable): Rename ktype_match; see fcc for explanation. diff --git a/src/lib/krb5/ccache/stdio/scc_retrv.c b/src/lib/krb5/ccache/stdio/scc_retrv.c index 0c905d7c98..9b91a685e7 100644 --- a/src/lib/krb5/ccache/stdio/scc_retrv.c +++ b/src/lib/krb5/ccache/stdio/scc_retrv.c @@ -134,29 +134,6 @@ register const krb5_data *data1, *data2; return memcmp(data1->data, data2->data, data1->length) ? FALSE : TRUE; } -static krb5_boolean -ktype_reasonable(context, creds) - register krb5_context context; - register krb5_creds *creds; -{ - register int i; - krb5_enctype * ktypes = (krb5_enctype *) NULL; - krb5_enctype enctype = creds->keyblock.enctype; - krb5_principal princ = creds->server; - - if (krb5_get_tgs_ktypes(context, princ, &ktypes)) - return FALSE; - - for (i=0; ktypes[i]; i++) { - if (ktypes[i] == enctype) { - free(ktypes); - return TRUE; - } - } - - free(ktypes); - return FALSE; -} /* * Effects: @@ -223,8 +200,7 @@ krb5_scc_retrieve(context, id, whichfields, mcreds, creds) (! set(KRB5_TC_MATCH_2ND_TKT) || data_match (&mcreds->second_ticket, &fetchcreds.second_ticket)) && - ((! set(KRB5_TC_MATCH_KTYPE)&& - ktype_reasonable (context, &fetchcreds))|| + ((! set(KRB5_TC_MATCH_KTYPE))|| (mcreds->keyblock.enctype == fetchcreds.keyblock.enctype)) ) { |