From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 9 May 2014 15:43:35 +0000 (-0400)
Subject: aklog: double get_credv5 in retry logic
X-Git-Tag: upstream/1.8.0_pre1^2~708
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b9979e1a23ce28b20fe95d5e6042b9b15506c993;p=packages%2Fo%2Fopenafs.git

aklog: double get_credv5 in retry logic

Fix a bug where get_credv5() is called twice, even if the first one
succeeded, in the aklog retry logic.

(This bug uncovers another bug where get_credv5_akimpersonate
crashes in the krb5 libs when get_credv5 is called back to back.)

Change-Id: Ie6cac3b4522946c87c30ad3cd6939738234800bf
Reviewed-on: http://gerrit.openafs.org/11133
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
index f397bf5dd..eaead4478 100644
--- a/src/aklog/aklog.c
+++ b/src/aklog/aklog.c
@@ -569,9 +569,9 @@ rxkad_get_ticket(krb5_context context, char *realm,
 		    }
 		    afs_dprintf("We've deduced that we need to authenticate"
 			    " to realm %s.\n", realm_of_cell);
+		    status = get_credv5(context, AFSKEY, cell->name,
+					realm_of_cell, v5cred);
 		}
-		status = get_credv5(context, AFSKEY, cell->name,
-				    realm_of_cell, v5cred);
 	    }
 
 	    /* If the realm and cell name match, then try without an