From: Tom Yu <tlyu@mit.edu>
Date: Fri, 22 Dec 2006 01:21:33 +0000 (+0000)
Subject: pull up r19007 from trunk
X-Git-Tag: krb5-1.6-beta2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbcf4276152f3373f7a6ce14ba718b6eba388f9e;p=krb5.git

pull up r19007 from trunk

 r19007@cathode-dark-space:  tlyu | 2006-12-21 20:19:55 -0500
 ticket: 5123

 	* src/lib/krb5/krb/get_in_tkt.c (krb5_get_init_creds): Fix
 	ordering bug in previous patch.


ticket: 5123

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19008 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 8470724ea..12476d3fa 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -1134,13 +1134,14 @@ krb5_get_init_creds(krb5_context context,
 		/* No preauth supplied, so can't query the plug-ins. */
 		ret = KRB5KRB_ERR_GENERIC;
 	    }
-	    krb5_free_error(context, err_reply);
-	    err_reply = NULL;
 	    if (ret) {
 		/* couldn't come up with anything better */
 		ret = err_reply->error + ERROR_TABLE_BASE_krb5;
-		goto cleanup;
 	    }
+	    krb5_free_error(context, err_reply);
+	    err_reply = NULL;
+	    if (ret)
+		goto cleanup;
 	}
 
         if (encoded_previous_request != NULL) {