From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sat, 18 Dec 2010 23:27:49 +0000 (-0500)
Subject: Fix fallback processing for ktc_GetTokenEx()
X-Git-Tag: upstream/1.8.0_pre1^2~4360
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=16dac6d4a6c9b19588daf6f11fa33940a381e23c;p=packages%2Fo%2Fopenafs.git

Fix fallback processing for ktc_GetTokenEx()

The fallback processing after ktc_GetToken() generates
a token set or fails.  Immediately return 'code' to the
caller after freeing ktcToken.

Change-Id: If82c5c94b75152eaa4d077b428238e8f77478d05
Reviewed-on: http://gerrit.openafs.org/3544
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index a4ee59770..25c2e37fa 100644
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -523,6 +523,7 @@ ktc_GetTokenEx(char *cellName, struct ktc_setTokenData **tokenSet) {
 	    memset(ktcToken, 0, sizeof(struct ktc_token));
 	}
 	free(ktcToken);
+        return code;
     }
     if (code)
 	return KTC_PIOCTLFAIL;
diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c
index b63c9bdf7..e5032bb74 100644
--- a/src/auth/ktc_nt.c
+++ b/src/auth/ktc_nt.c
@@ -714,7 +714,7 @@ ktc_GetTokenEx(char *cellName, struct ktc_setTokenData **tokenSet) {
 	    memset(ktcToken, 0, sizeof(struct ktc_token));
 	}
 	free(ktcToken);
-	return 0;
+	return code;
     }
     if (code)
 	return KTC_PIOCTLFAIL;