diff options
| author | Steve French <sfrench@samba.org> | 2004-02-11 23:11:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@samba.org> | 2004-02-11 23:11:00 +0000 |
| commit | 70fde6311dd7418040913d3f2abac22f53ea956f (patch) | |
| tree | 728ea93bd85e8130648704fe895fcb3446142a6c /source3/client/mount.cifs.c | |
| parent | 33b944911f6ee2c4de06fbefd3eb3e4c84504768 (diff) | |
| download | samba-70fde6311dd7418040913d3f2abac22f53ea956f.tar.gz samba-70fde6311dd7418040913d3f2abac22f53ea956f.tar.bz2 samba-70fde6311dd7418040913d3f2abac22f53ea956f.zip | |
Mount helper fixes for nosetuid, noexec part two of two
(This used to be commit c2b4d81a8dae23170d32713e3e766dcf5be9a040)
Diffstat (limited to 'source3/client/mount.cifs.c')
| -rwxr-xr-x | source3/client/mount.cifs.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index fc6bbb5b4f..7b5b87eddf 100755 --- a/source3/client/mount.cifs.c +++ b/source3/client/mount.cifs.c @@ -231,7 +231,7 @@ static int get_password_from_file(int file_descript, char * filename) return rc; } -static int parse_options(char * options, int filesys_flags) +static int parse_options(char * options, int * filesys_flags) { char * data; char * percent_char = 0; @@ -421,21 +421,21 @@ static int parse_options(char * options, int filesys_flags) and could generate spurious warnings depending on the level of the corresponding cifs vfs kernel code */ } else if (strncmp(data, "nosuid", 6) == 0) { - filesys_flags |= MS_NOSUID; + *filesys_flags |= MS_NOSUID; } else if (strncmp(data, "suid", 4) == 0) { - filesys_flags &= ~MS_NOSUID; + *filesys_flags &= ~MS_NOSUID; } else if (strncmp(data, "nodev", 5) == 0) { - filesys_flags |= MS_NODEV; + *filesys_flags |= MS_NODEV; } else if (strncmp(data, "dev", 3) == 0) { - filesys_flags &= ~MS_NODEV; + *filesys_flags &= ~MS_NODEV; } else if (strncmp(data, "noexec", 6) == 0) { - filesys_flags |= MS_NOEXEC; + *filesys_flags |= MS_NOEXEC; } else if (strncmp(data, "exec", 4) == 0) { - filesys_flags &= ~MS_NOEXEC; + *filesys_flags &= ~MS_NOEXEC; } else if (strncmp(data, "ro", 3) == 0) { - filesys_flags |= MS_RDONLY; + *filesys_flags |= MS_RDONLY; } else if (strncmp(data, "rw", 2) == 0) { - filesys_flags &= ~MS_RDONLY; + *filesys_flags &= ~MS_RDONLY; } /* else if (strnicmp(data, "port", 4) == 0) { if (value && *value) { vol->port = @@ -727,7 +727,7 @@ int main(int argc, char ** argv) ipaddr = parse_server(share_name); - if (orgoptions && parse_options(orgoptions, flags)) + if (orgoptions && parse_options(orgoptions, &flags)) return 1; /* BB save off path and pop after mount returns? */ |