From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 21 Apr 2011 19:24:45 +0000 (-0500)
Subject: aklog: Return token when performing 524 conversion
X-Git-Tag: upstream/1.6.0.pre5^2~33
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2d6f45161c65f3eaf2ca7f05ebbeb335e2e72fad;p=packages%2Fo%2Fopenafs.git

aklog: Return token when performing 524 conversion

We weren't actually returning a token and username from
rxkad_get_converted_token. Do so.

This is a 1.6-specific change. This issue was fixed on master when
aklog was changed to use the new SetTokenEx family of pioctls in
commit 53837416cbed3ba4d11f63015e1f13800519f2ed.

Change-Id: I7395034c5225ca62b562ea39bd01762c74090b03
Reviewed-on: http://gerrit.openafs.org/4518
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
index afb25b96d..121e3f426 100644
--- a/src/aklog/aklog.c
+++ b/src/aklog/aklog.c
@@ -824,6 +824,9 @@ rxkad_get_converted_token(krb5_context context, krb5_creds *v5cred,
     token->ticketLen = cred.ticket_st.length;
     memcpy(token->ticket, cred.ticket_st.dat, token->ticketLen);
 
+    *tokenPtr = token;
+    *userPtr = strdup(username);
+
     return 0;
 }
 #endif