svn commit: samba r9401 - in branches/SAMBA_3_0/source/client: .

[sfrench at samba.org]

Author: sfrench
Date: 2005-08-19 18:06:05 +0000 (Fri, 19 Aug 2005)
New Revision: 9401

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9401

Log:
Allow disabling mandatory byte range lock mount flag, and
fix corresponding entry in mtab.

Modified:
   branches/SAMBA_3_0/source/client/mount.cifs.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/mount.cifs.c
===================================================================
--- branches/SAMBA_3_0/source/client/mount.cifs.c	2005-08-19 17:48:29 UTC (rev 9400)
+++ branches/SAMBA_3_0/source/client/mount.cifs.c	2005-08-19 18:06:05 UTC (rev 9401)
@@ -506,6 +506,8 @@
 			*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 @@
 					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)