remove a bunch of kerberos definitions

3 files changed, 4 insertions, 48 deletions

diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index cb64205c178..0e505e8b54b 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.h,v 1.29 2008/04/22 18:31:12 blambert Exp $	*/
+/*	$OpenBSD: nfs.h,v 1.30 2008/06/08 18:23:03 thib Exp $	*/
 /*	$NetBSD: nfs.h,v 1.10.4.1 1996/05/27 11:23:56 fvdl Exp $	*/
 
 /*
@@ -153,7 +153,6 @@ struct nfsd_srvargs {
 	u_char		*nsd_verfstr;
 	struct timeval	nsd_timestamp;	/* timestamp from verifier */
 	u_int32_t	nsd_ttl;	/* credential ttl (sec) */
-	NFSKERBKEY_T	nsd_key;	/* Session key */
 };
 
 struct nfsd_cargs {
@@ -164,7 +163,6 @@ struct nfsd_cargs {
 	u_char		*ncd_authstr;	/* Authenticator string */
 	u_int		ncd_verflen;	/* and the verifier */
 	u_char		*ncd_verfstr;
-	NFSKERBKEY_T	ncd_key;	/* Session key */
 };
 
 /*
@@ -331,7 +329,6 @@ struct nfsuid {
 	int		nu_expire;	/* Expiry time (sec) */
 	struct timeval	nu_timestamp;	/* Kerb. timestamp */
 	u_int32_t	nu_nickname;	/* Nickname on server */
-	NFSKERBKEY_T	nu_key;		/* and session key */
 };
 
 #define	nu_inetaddr	nu_haddr.had_inetaddr
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index f220ddc6b49..5b4e8b634eb 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsmount.h,v 1.14 2007/06/13 18:05:27 thib Exp $	*/
+/*	$OpenBSD: nfsmount.h,v 1.15 2008/06/08 18:23:03 thib Exp $	*/
 /*	$NetBSD: nfsmount.h,v 1.10 1996/02/18 11:54:03 fvdl Exp $	*/
 
 /*
@@ -74,7 +74,6 @@ struct	nfsmount {
 	char	*nm_verfstr;		/* and the verifier */
 	int	nm_verflen;
 	u_char	nm_verf[NFSX_V3WRITEVERF]; /* V3 write verifier */
-	NFSKERBKEY_T nm_key;		/* and the session key */
 	int	nm_numuids;		/* Number of nfsuid mappings */
 	TAILQ_HEAD(, nfsuid) nm_uidlruhead; /* Lists of nfsuid mappings */
 	LIST_HEAD(, nfsuid) nm_uidhashtbl[NFS_MUIDHASHSIZ];
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 47058f0773c..b60f903049b 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpcv2.h,v 1.6 2003/06/02 23:28:20 millert Exp $	*/
+/*	$OpenBSD: rpcv2.h,v 1.7 2008/06/08 18:23:03 thib Exp $	*/
 /*	$NetBSD: rpcv2.h,v 1.8 1996/02/18 11:54:11 fvdl Exp $	*/
 
 /*
@@ -98,45 +98,5 @@
 #define	RPCMNT_NAMELEN	255
 #define	RPCMNT_PATHLEN	1024
 #define	RPCPROG_NFS	100003
- 
-/* Structs for common parts of the rpc's */
-struct rpcv2_time {
-	u_int32_t rpc_sec;
-	u_int32_t rpc_usec;
-};
 
-/*
- * Structures used for RPCAUTH_KERB4.
- */
-struct nfsrpc_fullverf {
-	u_int32_t t1;
-	u_int32_t t2;
-	u_int32_t w2;
-};
-
-struct nfsrpc_fullblock {
-	u_int32_t t1;
-	u_int32_t t2;
-	u_int32_t w1;
-	u_int32_t w2;
-};
-
-struct nfsrpc_nickverf {
-	u_int32_t kind;
-	struct nfsrpc_fullverf	verf;
-};
-
-/*
- * and their sizes in bytes.. If sizeof (struct nfsrpc_xx) != these
- * constants, well then things will break in mount_nfs and nfsd.
- */
-#define RPCX_FULLVERF	12
-#define RPCX_FULLBLOCK	16
-#define RPCX_NICKVERF	16
-
-typedef u_char			NFSKERBKEY_T[2];
-typedef u_char			NFSKERBKEYSCHED_T[2];
-#define NFS_KERBTTL	(30 * 60)	/* Credential ttl (sec) */
-#define NFS_KERBCLOCKSKEW (5 * 60)	/* Clock skew (sec) */
-#define NFS_KERBW1(t)	(*((u_long *)(&((t).dat[((t).length + 3) & ~0x3]))))
-#endif
+#endif	/* _NFS_RPCV2_H_ */