diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 16:43:27 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 16:43:27 +0000 |
| commit | 88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0 (patch) | |
| tree | 22fbd2670986bdd23c988858f9baa0af2fe25515 /src/lib/krb5/krb/decode_kdc.c | |
| parent | 43ce6c50a83b8550ed083a7362fa9528e50d2fc0 (diff) | |
| download | krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.zip krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.gz krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.bz2 | |
Reintegrate Macintosh changes
t_ser.c: Work around an optimizer bug in gcc under OSF/1 2.1.
The timeofday calls were left in the stage as described in the ChangeLog
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6766 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/decode_kdc.c')
| -rw-r--r-- | src/lib/krb5/krb/decode_kdc.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c index 642de5b..71e01a8 100644 --- a/src/lib/krb5/krb/decode_kdc.c +++ b/src/lib/krb5/krb/decode_kdc.c @@ -40,11 +40,10 @@ */ krb5_error_code -krb5_decode_kdc_rep(context, enc_rep, key, etype, dec_rep) +krb5_decode_kdc_rep(context, enc_rep, key, dec_rep) krb5_context context; krb5_data * enc_rep; const krb5_keyblock * key; - const krb5_enctype etype; krb5_kdc_rep ** dec_rep; { krb5_error_code retval; @@ -60,16 +59,10 @@ krb5_decode_kdc_rep(context, enc_rep, key, etype, dec_rep) if (retval) return retval; - if (local_dec_rep->enc_part.etype != etype) { + if (retval = krb5_kdc_rep_decrypt_proc(context, key, 0, local_dec_rep)) krb5_free_kdc_rep(context, local_dec_rep); - return KRB5_WRONG_ETYPE; - } - retval = krb5_kdc_rep_decrypt_proc(context, key, 0, local_dec_rep); - if (retval) { - krb5_free_kdc_rep(context, local_dec_rep); - return(retval); - } - *dec_rep = local_dec_rep; - return 0; + else + *dec_rep = local_dec_rep; + return(retval); } |