* 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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index dd837ead17391d24626a084c7d591c4a2d210e1a..a2f1e14f424806868df69c427b965954203ba245 100644 (file)
--- 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 a05b901243fb5b0165763761df6218f3be133be5..390e43e055b5627f3b3d73fcf852136f5956bd52 100644 (file)
--- 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;