svn rev #22308: trunk/src/lib/krb5/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22308
Commit By: ghudson
Log Message:
Simplify cleanup in obtain_sam_padata slightly.



Changed Files:
U   trunk/src/lib/krb5/krb/preauth.c
Modified: trunk/src/lib/krb5/krb/preauth.c
===================================================================
--- trunk/src/lib/krb5/krb/preauth.c	2009-05-04 17:16:38 UTC (rev 22307)
+++ trunk/src/lib/krb5/krb/preauth.c	2009-05-04 19:43:36 UTC (rev 22308)
@@ -455,7 +455,7 @@
 obtain_sam_padata(krb5_context context, krb5_pa_data *in_padata, krb5_etype_info etype_info, krb5_keyblock *def_enc_key, git_key_proc key_proc, krb5_const_pointer key_seed, krb5_creds *creds, krb5_kdc_req *request, krb5_pa_data **out_padata)
 {
     krb5_error_code		retval;
-    krb5_data *			scratch;
+    krb5_data *			scratch = 0;
     krb5_data			tmpsam;
     krb5_pa_data *		pa;
     krb5_sam_challenge		*sam_challenge = 0;
@@ -566,9 +566,7 @@
     retval = 0;
     
 cleanup:
-    if (scratch)
-	krb5_free_data(context, scratch);
-    if (sam_challenge)
-        free(sam_challenge);
+    krb5_free_data(context, scratch);
+    free(sam_challenge);
     return retval;
 }