summaryrefslogtreecommitdiffstats
path: root/sys/fs/nfs/nfs.h
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2009-05-14 21:39:08 +0000
committerrmacklem <rmacklem@FreeBSD.org>2009-05-14 21:39:08 +0000
commitef1be3984d15c3d19d3f36350bd596329e59ae95 (patch)
tree5c710d90ce1b15129bc2c43590e433010077b9c7 /sys/fs/nfs/nfs.h
parenta17331003b62d651244b335330ed0202c58d376e (diff)
downloadFreeBSD-src-ef1be3984d15c3d19d3f36350bd596329e59ae95.zip
FreeBSD-src-ef1be3984d15c3d19d3f36350bd596329e59ae95.tar.gz
Apply changes to the experimental nfs server so that it uses the security
flavors as exported in FreeBSD-CURRENT. This allows it to use a slightly modified mountd.c instead of a different utility. Approved by: kib (mentor)
Diffstat (limited to 'sys/fs/nfs/nfs.h')
-rw-r--r--sys/fs/nfs/nfs.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h
index b9d030f..14656a5 100644
--- a/sys/fs/nfs/nfs.h
+++ b/sys/fs/nfs/nfs.h
@@ -580,7 +580,6 @@ struct nfsrv_descript {
u_int64_t nd_compref; /* Compound RPC ref# */
time_t nd_tcpconntime; /* Time TCP connection est. */
nfsquad_t nd_clientid; /* Implied clientid */
- int nd_credflavor; /* credential flavor */
int nd_gssnamelen; /* principal name length */
char *nd_gssname; /* principal name */
};
@@ -608,8 +607,11 @@ struct nfsrv_descript {
#define ND_V4WCCATTR 0x00010000
#define ND_NFSCB 0x00020000
#define ND_AUTHNONE 0x00040000
-#define ND_EXGSSONLY 0x00080000
-#define ND_INCRSEQID 0x00100000
+#define ND_EXAUTHSYS 0x00080000
+#define ND_EXGSS 0x00100000
+#define ND_EXGSSINTEGRITY 0x00200000
+#define ND_EXGSSPRIVACY 0x00400000
+#define ND_INCRSEQID 0x00800000
/*
* ND_GSS should be the "or" of all GSS type authentications.
@@ -631,11 +633,6 @@ struct nfsv4_opflag {
#define NFSRVSEQID_OPEN 0x04
/*
- * MNT_EXGSSONLY is the Or of all the EXGSS bits.
- */
-#define MNT_EXGSSONLY MNT_EXGSSKRB5
-
-/*
* assign a doubly linked list to a new head
* and prepend one list into another.
*/
OpenPOWER on IntegriCloud