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 a4ee597..25c2e37 100644 (file)
--- 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 b63c9bd..e5032bb 100644 (file)
--- 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;