X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fconfigfile.c;h=e347b0ebcaf3fed77f86b873c25a3e77b6bd5ec7;hp=cad8c52f7ef72e112e529ea5860558a95b7ecf8f;hb=8414d150cee62ba0554cfd645956a88dba02a7eb;hpb=0cdb36e69a51eabc119de314e43d40daf6ee49ab

diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index cad8c52..e347b0e 100644
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -37,11 +37,11 @@
 #define NFSMOUNT_GLOBAL_OPTS "NFSMount_Global_Options"
 #endif
 
-#ifndef NFSMOUNT_MOUNTPOINT  "MountPoint"
+#ifndef NFSMOUNT_MOUNTPOINT
 #define NFSMOUNT_MOUNTPOINT "MountPoint"
 #endif
 
-#ifndef NFSMOUNT_SERVER "Server"
+#ifndef NFSMOUNT_SERVER
 #define NFSMOUNT_SERVER "Server"
 #endif
 
@@ -83,6 +83,9 @@ char *mountopts_alias(char *opt, int *argtype)
 		*argtype = mnt_alias_tab[i].argtype;
 		return mnt_alias_tab[i].opt;
 	}
+	/* Make option names case-insensitive */
+	upper2lower(opt);
+
 	return opt;
 }
 /*
@@ -202,7 +205,7 @@ conf_parse_mntopts(char *section, char *arg, char *opts)
 		 * Do not overwrite options if already exists 
 		 */
 		snprintf(buf, BUFSIZ, "%s=", node->field);
-		if (opts && strstr(opts, buf) != NULL)
+		if (opts && strcasestr(opts, buf) != NULL)
 			continue;
 		if (lookup_entry(node->field) != NULL)
 			continue;