svn commit: samba r15112 - in branches/SAMBA_3_0/source: param smbd

[jra at samba.org]

Author: jra
Date: 2006-04-17 22:32:38 +0000 (Mon, 17 Apr 2006)
New Revision: 15112

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

Log:
Move strict locking default to auto. Fix up the error
return for one of the Samba4 torture tests.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2006-04-17 22:32:35 UTC (rev 15111)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2006-04-17 22:32:38 UTC (rev 15112)
@@ -551,7 +551,7 @@
 	False,			/* bStoreDosAttributes */
 	False,			/* bDmapiSupport */
 	True,			/* bLocking */
-	True,			/* iStrictLocking */
+	Auto,			/* iStrictLocking */
 	True,			/* bPosixLocking */
 	True,			/* bShareModes */
 	True,			/* bOpLocks */

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2006-04-17 22:32:35 UTC (rev 15111)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2006-04-17 22:32:38 UTC (rev 15112)
@@ -5221,7 +5221,7 @@
 		/* we don't support these - and CANCEL_LOCK makes w2k
 		   and XP reboot so I don't really want to be
 		   compatible! (tridge) */
-		return ERROR_DOS(ERRDOS, ERRnoatomiclocks);
+		return ERROR_FORCE_DOS(ERRDOS, ERRnoatomiclocks);
 	}
 	
 	if (locktype & LOCKING_ANDX_CANCEL_LOCK) {