diff options
| author | Steve Dickson <steved@redhat.com> | 2009-08-07 14:34:42 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-08-16 17:06:44 -0400 |
| commit | 8414d150cee62ba0554cfd645956a88dba02a7eb (patch) | |
| tree | fe57de29ea4a1c911aa7eb9cabff7adca37de0ae /utils/mount/configfile.c | |
| parent | a0caba9887474cdc9b9ba8b113a869ff7954ab84 (diff) | |
| download | nfs-utils-8414d150cee62ba0554cfd645956a88dba02a7eb.tar.gz nfs-utils-8414d150cee62ba0554cfd645956a88dba02a7eb.tar.xz nfs-utils-8414d150cee62ba0554cfd645956a88dba02a7eb.zip | |
Now that only the Section names are case-insensitive
the mount code has to make sure the the mount options
given to the kernel are in the correct case.
Fixed a couple of warnings on #ifndefs
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/mount/configfile.c')
| -rw-r--r-- | utils/mount/configfile.c | 9 |
1 files changed, 6 insertions, 3 deletions
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; |