summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSteve French <sfrench@samba.org>2004-02-17 22:51:42 +0000
committerSteve French <sfrench@samba.org>2004-02-17 22:51:42 +0000
commit5e39e9f3130e48917db9d9802623befa536df399 (patch)
tree937678db608d51f7740b80d9956272616e210220 /source3
parent8801465d30f6117e87fef4592bf9aaf103962c2c (diff)
downloadsamba-5e39e9f3130e48917db9d9802623befa536df399.tar.gz
samba-5e39e9f3130e48917db9d9802623befa536df399.tar.bz2
samba-5e39e9f3130e48917db9d9802623befa536df399.zip
Fix incorrect strnicmp len
(This used to be commit ad1ebb5000066d44ce94f0341fb31351b3900e95)
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/client/mount.cifs.c45
1 files changed, 22 insertions, 23 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index bb893d0106..fa7897fe66 100755
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -432,33 +432,32 @@ static int parse_options(char * options, int * filesys_flags)
*filesys_flags |= MS_NOEXEC;
} else if (strncmp(data, "exec", 4) == 0) {
*filesys_flags &= ~MS_NOEXEC;
- } else if (strncmp(data, "ro", 3) == 0) {
+ } else if (strncmp(data, "ro", 2) == 0) {
*filesys_flags |= MS_RDONLY;
} else if (strncmp(data, "rw", 2) == 0) {
*filesys_flags &= ~MS_RDONLY;
} /* else if (strnicmp(data, "port", 4) == 0) {
- if (value && *value) {
- vol->port =
- simple_strtoul(value, &value, 0);
- }
- } else if (strnicmp(data, "rsize", 5) == 0) {
- if (value && *value) {
- vol->rsize =
- simple_strtoul(value, &value, 0);
- }
- } else if (strnicmp(data, "wsize", 5) == 0) {
- if (value && *value) {
- vol->wsize =
- simple_strtoul(value, &value, 0);
- }
- } else if (strnicmp(data, "version", 3) == 0) {
-
- } else if (strnicmp(data, "rw", 2) == 0) {
-
- } else
- printf("CIFS: Unknown mount option %s\n",data); */
+ if (value && *value) {
+ vol->port =
+ simple_strtoul(value, &value, 0);
+ }
+ } else if (strnicmp(data, "rsize", 5) == 0) {
+ if (value && *value) {
+ vol->rsize =
+ simple_strtoul(value, &value, 0);
+ }
+ } else if (strnicmp(data, "wsize", 5) == 0) {
+ if (value && *value) {
+ vol->wsize =
+ simple_strtoul(value, &value, 0);
+ }
+ } else if (strnicmp(data, "version", 3) == 0) {
+ } else {
+ printf("CIFS: Unknown mount option %s\n",data);
+ } */ /* nothing to do on those four mount options above.
+ Just pass to kernel and ignore them here */
- /* move to next option */
+ /* move to next option */
data = next_keyword+1;
/* put overwritten equals sign back */
@@ -466,7 +465,7 @@ static int parse_options(char * options, int * filesys_flags)
value--;
*value = '=';
}
-
+
/* put previous overwritten comma back */
if(next_keyword)
*next_keyword = ',';