Remember to free the addresses if necessary; cred_cleanup fixed to do all

the cleanup and return the appropriate error code.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3669 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 1706959eb6e1b8854684c629026f02316ed0498b..9a64d378aecb15e720bde1ccf4c7a6874a4c9823 100644 (file)
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -315,6 +315,8 @@ cleanup:
        krb5_free_keyblock(decrypt_key);
     if (request.padata)
        free(request.padata);
+    if (!addrs)
+       krb5_free_addresses(request.addresses);
     return retval;
     
     /*
@@ -336,8 +338,6 @@ cred_cleanup:
        krb5_free_addresses(creds->addresses);
        creds->addresses = 0;
     }
-    
-
-    
+    goto cleanup;
 }