From: Christos Zoulas <christos@zoulas.com>
Date: Fri, 23 Nov 2012 17:10:07 +0000 (-0500)
Subject: recognize a few more nfs flags; specifically noacl amongst others.
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=c457cdc9f4440b9db0c336bf8a6db2dc7dbd042f;p=am-utils-6.2.git

recognize a few more nfs flags; specifically noacl amongst others.
---

diff --git a/configure.in b/configure.in
index 401fd801..04131505 100644
--- a/configure.in
+++ b/configure.in
@@ -1188,6 +1188,7 @@ AMU_CHECK_MNTTAB_OPTS(	\
 	maxgroups	\
 	multi		\
 	noac		\
+	noacl		\
 	noauto		\
 	noconn		\
 	nocto		\
@@ -1295,6 +1296,7 @@ AMU_CHECK_MNT2_NFS_OPTS(	\
 	acregmax	\
 	acregmin	\
 	auto		\
+	broken_suid	\
 	deadthresh	\
 	dirsync		\
 	dumbtimr	\
@@ -1310,11 +1312,14 @@ AMU_CHECK_MNT2_NFS_OPTS(	\
 	maxgrps		\
 	nfsv3		\
 	noac		\
+	noacl		\
 	noconn		\
 	nocto		\
 	noint		\
 	nonlm		\
+	nordirplus	\
 	nqnfs		\
+	nqlooklease	\
 	pgthresh	\
 	posix		\
 	private		\
@@ -1328,9 +1333,11 @@ AMU_CHECK_MNT2_NFS_OPTS(	\
 	rsize		\
 	soft		\
 	spongy		\
+	strictlock	\
 	symttl		\
 	tcp		\
 	timeo		\
+	unshared	\
 	ver3		\
 	wsize		\
 	xlatecookie	\
diff --git a/include/am_compat.h b/include/am_compat.h
index 631297cf..4e3687ca 100644
--- a/include/am_compat.h
+++ b/include/am_compat.h
@@ -90,6 +90,10 @@
 # define MNTTAB_OPT_NOAC "noac"
 #endif /* defined(MNT2_NFS_OPT_NOAC) && !defined(MNTTAB_OPT_NOAC) */
 
+#if defined(MNT2_NFS_OPT_NOACL) && !defined(MNTTAB_OPT_NOACL)
+# define MNTTAB_OPT_NOACL "noacl"
+#endif /* defined(MNT2_NFS_OPT_NOACL) && !defined(MNTTAB_OPT_NOACL) */
+
 #if defined(MNT2_NFS_OPT_NOCONN) && !defined(MNTTAB_OPT_NOCONN)
 # define MNTTAB_OPT_NOCONN "noconn"
 # ifndef MNTTAB_OPT_CONN
diff --git a/m4/macros/header_templates.m4 b/m4/macros/header_templates.m4
index 254f330b..71cca120 100644
--- a/m4/macros/header_templates.m4
+++ b/m4/macros/header_templates.m4
@@ -466,6 +466,9 @@ AH_TEMPLATE([MNTTAB_OPT_NOWIN95],
 AH_TEMPLATE([MNTTAB_OPT_SHORTNAME],
 [Force old DOS short names only])
 
+AH_TEMPLATE([MNTTAB_OPT_NOACL],
+[Access Control Lists are not supported])
+
 
 AH_TEMPLATE([MNT2_GEN_OPT_ASYNC],
 [asynchronous filesystem access])
@@ -590,6 +593,9 @@ AH_TEMPLATE([MNT2_NFS_OPT_ACREGMIN],
 AH_TEMPLATE([MNT2_NFS_OPT_AUTHERR],
 [Authentication error])
 
+AH_TEMPLATE([MNT2_NFS_OPT_BROKEN_SUID],
+[Linux broken setuid])
+
 AH_TEMPLATE([MNT2_NFS_OPT_DEADTHRESH],
 [set dead server retry thresh])
 
@@ -656,6 +662,9 @@ AH_TEMPLATE([MNT2_NFS_OPT_NFSV3],
 AH_TEMPLATE([MNT2_NFS_OPT_NOAC],
 [don't cache attributes])
 
+AH_TEMPLATE([MNT2_NFS_OPT_NOACL],
+[does not support Access Control Lists])
+
 AH_TEMPLATE([MNT2_NFS_OPT_NOCONN],
 [Don't Connect the socket])
 
@@ -665,6 +674,12 @@ AH_TEMPLATE([MNT2_NFS_OPT_NOCTO],
 AH_TEMPLATE([MNT2_NFS_OPT_NOINT],
 [disallow interrupts on hard mounts])
 
+AH_TEMPLATE([MNT2_NFS_OPT_NONLM],
+[does not support locking])
+
+AH_TEMPLATE([MNT2_NFS_OPT_NORDIRPLUS],
+[does not support readdir+])
+
 AH_TEMPLATE([MNT2_NFS_OPT_NQLOOKLEASE],
 [Get lease for lookup])
 
@@ -725,12 +740,17 @@ AH_TEMPLATE([MNT2_NFS_OPT_SOFT],
 AH_TEMPLATE([MNT2_NFS_OPT_SPONGY],
 [spongy mount])
 
+AH_TEMPLATE([MNT2_NFS_OPT_STRICTLOCK],
+[Reserved for nfsv4])
 AH_TEMPLATE([MNT2_NFS_OPT_TIMEO],
 [set initial timeout])
 
 AH_TEMPLATE([MNT2_NFS_OPT_TCP],
 [use TCP for mounts])
 
+AH_TEMPLATE([MNT2_NFS_OPT_UNSHARED],
+[do not use shared cache for all mountpoints])
+
 AH_TEMPLATE([MNT2_NFS_OPT_VER3],
 [linux NFSv3])