mirror of
https://git.openafs.org/openafs.git
synced 2025-01-19 15:30:14 +00:00
viced-type-errors-20090319
LICENSE IPL10 use ktc_encryptionKey instead of a char array to avoid prototype issues threadNum should return int, not char
This commit is contained in:
parent
3d54f743bc
commit
a343f09803
@ -352,7 +352,7 @@ ResetCheckDescriptors(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(AFS_PTHREAD_ENV)
|
#if defined(AFS_PTHREAD_ENV)
|
||||||
char *
|
int *
|
||||||
threadNum(void)
|
threadNum(void)
|
||||||
{
|
{
|
||||||
return pthread_getspecific(rx_thread_id_key);
|
return pthread_getspecific(rx_thread_id_key);
|
||||||
@ -361,7 +361,7 @@ threadNum(void)
|
|||||||
|
|
||||||
/* proc called by rxkad module to get a key */
|
/* proc called by rxkad module to get a key */
|
||||||
static int
|
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 */
|
/* find the key */
|
||||||
static struct afsconf_key tkey;
|
static struct afsconf_key tkey;
|
||||||
@ -371,7 +371,7 @@ get_key(char *arock, register afs_int32 akvno, char *akey)
|
|||||||
ViceLog(0, ("conf dir not open\n"));
|
ViceLog(0, ("conf dir not open\n"));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
code = afsconf_GetKey(confDir, akvno, tkey.key);
|
code = afsconf_GetKey(confDir, akvno, (struct ktc_encryptionKey *)tkey.key);
|
||||||
if (code) {
|
if (code) {
|
||||||
ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code));
|
ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code));
|
||||||
return code;
|
return code;
|
||||||
|
Loading…
Reference in New Issue
Block a user