diff options
| author | Steve French <sfrench@samba.org> | 2005-08-19 18:06:05 +0000 |
|---|---|---|
| committer | Steve French <sfrench@samba.org> | 2005-08-19 18:06:05 +0000 |
| commit | 5151a1c4a34937957516d8117bc4fb86a98915dd (patch) | |
| tree | 77441a2a58df7c4b710f47327732ea3e9b97e0bb /source/client | |
| parent | fe44e24a9a2a1e6c4a0f229aadafd4e2fceb93fb (diff) | |
| download | samba-5151a1c4a34937957516d8117bc4fb86a98915dd.tar.gz samba-5151a1c4a34937957516d8117bc4fb86a98915dd.tar.xz samba-5151a1c4a34937957516d8117bc4fb86a98915dd.zip | |
r9401: Allow disabling mandatory byte range lock mount flag, and
fix corresponding entry in mtab.
Diffstat (limited to 'source/client')
| -rwxr-xr-x | source/client/mount.cifs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c index 0c3b0b321e8..a6136a9e2c2 100755 --- a/source/client/mount.cifs.c +++ b/source/client/mount.cifs.c @@ -506,6 +506,8 @@ static int parse_options(char * options, int * filesys_flags) *filesys_flags &= ~MS_NOSUID; } else if (strncmp(data, "nodev", 5) == 0) { *filesys_flags |= MS_NODEV; + } else if (strncmp(data, "nobrl", 5) == 0) { + *filesys_flags &= ~MS_MANDLOCK; } else if (strncmp(data, "dev", 3) == 0) { *filesys_flags &= ~MS_NODEV; } else if (strncmp(data, "noexec", 6) == 0) { @@ -1138,8 +1140,6 @@ mount_retry: strcat(mountent.mnt_opts,"rw"); if(flags & MS_MANDLOCK) strcat(mountent.mnt_opts,",mand"); - else - strcat(mountent.mnt_opts,",nomand"); if(flags & MS_NOEXEC) strcat(mountent.mnt_opts,",noexec"); if(flags & MS_NOSUID) |