r9401: Allow disabling mandatory byte range lock mount flag, and

fix corresponding entry in mtab.
(This used to be commit e5cb7d2131b7c6963f00a8a329bf589dd78e09ce)

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 0c3b0b321e803f90d8eca0c863668888f93b2413..a6136a9e2c26cfb7f558db36f0f361c093a6180b 100755 (executable)
--- a/source3/client/mount.cifs.c
+++ b/source3/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)