X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfs4mount.c;h=2a58d0ae08e1208479d85f0c72987022f01bd97c;hp=717ad56756cad43f8445b73d4064ad65d2929afb;hb=89fb5a45d2020aaee203dd9016d98c3ff9d9f991;hpb=940c7c304d4a43c00c27529cdddc7c87db6eef87

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 717ad56..2a58d0a 100644
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -50,6 +50,7 @@
 #endif
 
 extern int verbose;
+extern int sloppy;
 
 char *IDMAPLCK = DEFAULT_DIR "/rpcidmapd";
 #define idmapd_check() do { \
@@ -308,7 +309,7 @@ int nfs4mount(const char *spec, const char *node, int *flags,
 				num_flavour = parse_sec(opteq+1, pseudoflavour);
 				if (!num_flavour)
 					goto fail;
-			} else if (!strcmp(opt, "addr")) {
+			} else if (!strcmp(opt, "addr") || sloppy) {
 				/* ignore */;
 			} else {
 				printf(_("unknown nfs mount parameter: "
@@ -335,7 +336,7 @@ int nfs4mount(const char *spec, const char *node, int *flags,
 				nocto = !val;
 			else if (!strcmp(opt, "ac"))
 				noac = !val;
-			else {
+			else if (!sloppy) {
 				printf(_("unknown nfs mount option: "
 					 "%s%s\n"), val ? "" : "no", opt);
 				goto fail;
@@ -351,6 +352,10 @@ int nfs4mount(const char *spec, const char *node, int *flags,
 	/*
 	 * Give a warning if the rpc.idmapd daemon is not running
 	 */
+#if 0
+	/* We shouldn't have these checks as nothing in this package
+	 * creates the files that are checked
+	 */
 	idmapd_check();
 
 	if (num_flavour == 0)
@@ -361,6 +366,7 @@ int nfs4mount(const char *spec, const char *node, int *flags,
 		 */
 		gssd_check();
 	}
+#endif
 	data.auth_flavourlen = num_flavour;
 	data.auth_flavours = pseudoflavour;