svn commit: samba r15111 - in trunk/source: param smbd
jra at samba.org
jra at samba.org
Mon Apr 17 22:32:37 GMT 2006
Author: jra
Date: 2006-04-17 22:32:35 +0000 (Mon, 17 Apr 2006)
New Revision: 15111
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15111
Log:
Move strict locking default to auto. Fix up the error
return for one of the Samba4 torture tests.
Jeremy.
Modified:
trunk/source/param/loadparm.c
trunk/source/smbd/reply.c
Changeset:
Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c 2006-04-17 22:00:30 UTC (rev 15110)
+++ trunk/source/param/loadparm.c 2006-04-17 22:32:35 UTC (rev 15111)
@@ -551,7 +551,7 @@
False, /* bStoreDosAttributes */
False, /* bDmapiSupport */
True, /* bLocking */
- True, /* iStrictLocking */
+ Auto, /* iStrictLocking */
True, /* bPosixLocking */
True, /* bShareModes */
True, /* bOpLocks */
Modified: trunk/source/smbd/reply.c
===================================================================
--- trunk/source/smbd/reply.c 2006-04-17 22:00:30 UTC (rev 15110)
+++ trunk/source/smbd/reply.c 2006-04-17 22:32:35 UTC (rev 15111)
@@ -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) {
More information about the samba-cvs
mailing list