116-oplocks.diff   [plain text]


--- samba/docs/manpages/smb.conf.5.orig 2004-07-23 14:18:17.000000000 -0700
+++ samba/docs/manpages/smb.conf.5      2004-07-23 15:24:11.000000000 -0700
@@ -2660,7 +2660,7 @@
 
 Oplocks may be selectively turned off on certain files with a share\&. See the \fI veto oplock files\fR parameter\&. On some systems oplocks are recognized by the underlying operating system\&. This allows data synchronization between all access to oplocked files, whether it be via Samba or NFS or a local UNIX process\&. See the\fIkernel oplocks\fR parameter for details\&.
 
-Default: \fB\fIoplocks\fR = yes \fR 
+Default: \fB\fIoplocks\fR = no \fR 
 
 .TP
 os2 driver map (G)
@@ -3729,7 +3729,7 @@
 
 Well\-behaved clients always ask for lock checks when it is important\&. So in the vast majority of cases, \fBstrict locking = no\fR is preferable\&.
 
-Default: \fB\fIstrict locking\fR = no \fR 
+Default: \fB\fIstrict locking\fR = yes \fR 
 
 .TP
 strict sync (S)
--- samba/source/param/loadparm.c.orig	Thu Dec 18 15:12:46 2003
+++ samba/source/param/loadparm.c	Fri Dec 19 08:31:23 2003
@@ -506,7 +506,7 @@ static service sDefault = {
 	True,			/* bStrictLocking */
 	True,			/* bPosixLocking */
 	True,			/* bShareModes */
-	True,			/* bOpLocks */
+	False,			/* bOpLocks */
 	True,			/* bLevel2OpLocks */
 	False,			/* bOnlyUser */
 	True,			/* bMangledNames */