From 337db26f163317f70cf9e00b8aaf26373e4eb366 Mon Sep 17 00:00:00 2001 From: Steve French Date: Fri, 19 Aug 2005 18:06:05 +0000 Subject: r9401: Allow disabling mandatory byte range lock mount flag, and fix corresponding entry in mtab. (This used to be commit e5cb7d2131b7c6963f00a8a329bf589dd78e09ce) --- source3/client/mount.cifs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/client') diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index 0c3b0b321e..a6136a9e2c 100755 --- 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) -- cgit