From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 19 Mar 2009 14:58:32 +0000 (+0000)
Subject: DEVEL15-viced-type-errors-20090319
X-Git-Tag: openafs-devel-1_5_58~54
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=670733ceefdaf52a666aefae75bb051d4a1393ff;p=packages%2Fo%2Fopenafs.git

DEVEL15-viced-type-errors-20090319

LICENSE IPL10

use ktc_encryptionKey instead of a char array to avoid prototype issues
threadNum should return int, not char


(cherry picked from commit a343f09803a4b3d5c5492c7d52becbd1526c1f8b)
---

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 7c2ba92bd..ff15c477f 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -348,7 +348,7 @@ ResetCheckDescriptors(void)
 }
 
 #if defined(AFS_PTHREAD_ENV)
-char *
+int *
 threadNum(void)
 {
     return pthread_getspecific(rx_thread_id_key);
@@ -357,7 +357,7 @@ threadNum(void)
 
 /* proc called by rxkad module to get a key */
 static int
-get_key(char *arock, register afs_int32 akvno, char *akey)
+get_key(char *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey)
 {
     /* find the key */
     static struct afsconf_key tkey;
@@ -367,7 +367,7 @@ get_key(char *arock, register afs_int32 akvno, char *akey)
 	ViceLog(0, ("conf dir not open\n"));
 	return 1;
     }
-    code = afsconf_GetKey(confDir, akvno, tkey.key);
+    code = afsconf_GetKey(confDir, akvno, (struct ktc_encryptionKey *)tkey.key);
     if (code) {
 	ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code));
 	return code;