From 32828680ae0342b91bea9fc2c4ecceb25510d7f3 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 2 Nov 2007 18:01:32 +0000 Subject: [PATCH] auth-getkey-prototyping-20071102 make this sane --- src/auth/cellconfig.c | 6 +++++- src/auth/cellconfig.p.h | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index ed262de2c..6db4c5265 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -18,6 +18,8 @@ RCSID #ifdef UKERNEL #include "afs/sysincludes.h" #include "afsincludes.h" +#include "des/des.h" +#include "rx/rxkad.h" #else /* UKERNEL */ #include #ifdef AFS_NT40_ENV @@ -51,6 +53,8 @@ RCSID #ifdef HAVE_UNISTD_H #include #endif +#include +#include #endif /* UKERNEL */ #include #include "cellconfig.h" @@ -1318,7 +1322,7 @@ afsconf_GetLatestKey(struct afsconf_dir * adir, afs_int32 * avno, /* get a particular key */ int -afsconf_GetKey(void *rock, int avno, struct ktc_encryptionKey *akey) +afsconf_GetKey(void *rock, afs_int32 avno, struct ktc_encryptionKey *akey) { struct afsconf_dir *adir = (struct afsconf_dir *) rock; register int i, maxa; diff --git a/src/auth/cellconfig.p.h b/src/auth/cellconfig.p.h index 4a1bf0d5c..4819510f8 100644 --- a/src/auth/cellconfig.p.h +++ b/src/auth/cellconfig.p.h @@ -125,9 +125,10 @@ extern int afsconf_IntGetKeys(struct afsconf_dir *adir); extern int afsconf_GetKeys(struct afsconf_dir *adir, struct afsconf_keys *astr); extern afs_int32 afsconf_GetLatestKey(struct afsconf_dir *adir, - afs_int32 * avno, char *akey); -extern int afsconf_GetKey(struct afsconf_dir *adir, afs_int32 avno, - char *akey); + afs_int32 * avno, + struct ktc_encryptionKey *akey); +extern int afsconf_GetKey(void *rock, afs_int32 avno, + struct ktc_encryptionKey *akey); extern int afsconf_AddKey(struct afsconf_dir *adir, afs_int32 akvno, char akey[8], afs_int32 overwrite); extern int afsconf_DeleteKey(struct afsconf_dir *adir, afs_int32 akvno); -- 2.39.5