diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-07-15 06:00:11 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-07-15 06:00:11 +0000 |
| commit | 1de6d49d398c22e83c5fcd0d48bc24d28c495304 (patch) | |
| tree | d4c3d4e4885ff775558a685861800bacbbca70ad /src | |
| parent | 8ba8a8717ea2d5bb9a70f6dec7f719ad3fb7a8f9 (diff) | |
| download | krb5-1de6d49d398c22e83c5fcd0d48bc24d28c495304.tar.gz krb5-1de6d49d398c22e83c5fcd0d48bc24d28c495304.tar.xz krb5-1de6d49d398c22e83c5fcd0d48bc24d28c495304.zip | |
* kdc_preauth.c (get_sam_edata): Don't goto cleanup if SAM is not
used; this prevents freeing an unallocated keyblock.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10115 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdc/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kdc/kdc_preauth.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index dd837ead1..a2f1e14f4 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 15 01:55:56 1997 Tom Yu <tlyu@mit.edu> + + * kdc_preauth.c (get_sam_edata): Don't goto cleanup if SAM is not + used; this prevents freeing an unallocated keyblock. + Thu May 29 21:08:24 1997 Theodore Y. Ts'o <tytso@mit.edu> * do_as_req.c (process_as_req), do_tgs_req (process_tgs_req): Use diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index a05b90124..390e43e05 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -694,11 +694,9 @@ get_sam_edata(context, request, client, server, pa_data) } /* now we can use encrypting_key... */ } - } else { - /* SAM is not an option - so don't return as hint */ - retval = KRB5_PREAUTH_BAD_TYPE; - goto cleanup; - } + } else + /* SAM is not an option - so don't return as hint */ + return KRB5_PREAUTH_BAD_TYPE; krb5_princ_component(kdc_context,newp,probeslot)->data = 0; krb5_princ_component(kdc_context,newp,probeslot)->length = 0; |