revert previous mistaken commit, and add the real patch (new nfs version

function) that got rejected

diff --git a/libamu/mount_fs.c b/libamu/mount_fs.c
index 534b0d231047796f3f2e40f11626ec144320cc6e..56a936f761e586709d8ba5ee0e54712a3064d918 100644 (file)
--- a/libamu/mount_fs.c
+++ b/libamu/mount_fs.c
@@ -1079,7 +1079,7 @@ struct {
 static char *
 set_nfs4_security(nfs4_args_t *nap, mntent_t *mntp)
 {
-  const char *o = hasmntopt(mntp, MNTTAB_OPT_SEC);
+  const char *o = hasmnteq(mntp, MNTTAB_OPT_SEC);
   char *q, *s, *ss;
   size_t l, i;
 
@@ -1478,3 +1478,9 @@ compute_automounter_nfs_args(nfs_args_t *nap, mntent_t *mntp)
   nap->flags |= MNT2_NFS_OPT_RESVPORT;
 #endif /* MNT2_NFS_OPT_RESVPORT */
 }
+
+int
+nfs_valid_version(u_long v)
+{
+  return v >= NFS_VERS_MIN && v <= NFS_VERS_MAX;
+}