X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Frxkad%2Fprivate_data.h;h=5707b7c3f281622707afb5348ff5d57a1a64ab65;hp=8c4507bc90b0c11099bc66d80cd38cbe888856c2;hb=85f1ef34c2533da2f47757bb8d8a3aecb9083283;hpb=1344a69c57f6c2b8e0588e4b18b1178bc596f190

diff --git a/src/rxkad/private_data.h b/src/rxkad/private_data.h
index 8c4507b..5707b7c 100644
--- a/src/rxkad/private_data.h
+++ b/src/rxkad/private_data.h
@@ -51,11 +51,12 @@ struct rxkad_cidgen {
 #define PDATA_SIZE(l) (sizeof(struct rxkad_cprivate) - MAXKTCTICKETLEN + (l))
 
 /* private data in client-side security object */
+/* type and level offsets should match sprivate */
 struct rxkad_cprivate {
-    afs_int32 kvno;		/* key version of ticket */
-    afs_int16 ticketLen;	/* length of ticket */
     rxkad_type type;		/* always client */
     rxkad_level level;		/* minimum security level of client */
+    afs_int32 kvno;		/* key version of ticket */
+    afs_int32 ticketLen;	/* length of ticket */
     fc_KeySchedule keysched;	/* the session key */
     fc_InitializationVector ivec;	/* initialization vector for cbc */
     char ticket[MAXKTCTICKETLEN];	/* the ticket for the server */
@@ -69,12 +70,18 @@ struct rxkad_cconn {
 };
 
 /* private data in server-side security object */
+/* type and level offsets should match cprivate */
 struct rxkad_sprivate {
-    char *get_key_rock;		/* rock for get_key function */
-    int (*get_key) ();		/* func. of kvno and server key ptr */
-    int (*user_ok) ();		/* func called with new client name */
     rxkad_type type;		/* always server */
     rxkad_level level;		/* minimum security level of server */
+    void *get_key_rock;		/* rock for get_key function */
+    int (*get_key) (void *, int,
+		    struct ktc_encryptionKey *);
+				/* func. of kvno and server key ptr */
+    int (*user_ok) (char *, char *,
+		    char *, afs_int32);
+				/* func called with new client name */
+    afs_uint32 flags;		/* configuration flags */
 };
 
 /* private data in server-side connection */