summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-04-17 22:32:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:24 -0500
commit5445694eb9c7a5e64e7e58feb78c87bc627402b5 (patch)
tree6e77669860e973b65f2f65ae80d39dcce6a570ce
parenta3fdf8ac21a8cbb95c336177a4d32c8c5dec09b7 (diff)
downloadsamba-5445694eb9c7a5e64e7e58feb78c87bc627402b5.tar.gz
samba-5445694eb9c7a5e64e7e58feb78c87bc627402b5.tar.bz2
samba-5445694eb9c7a5e64e7e58feb78c87bc627402b5.zip
r15112: Move strict locking default to auto. Fix up the error
return for one of the Samba4 torture tests. Jeremy. (This used to be commit 9db6617756ff155eb7549c3c622a9920189e577d)
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/reply.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index af4293a11e..e0cbc981de 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -551,7 +551,7 @@ static service sDefault = {
False, /* bStoreDosAttributes */
False, /* bDmapiSupport */
True, /* bLocking */
- True, /* iStrictLocking */
+ Auto, /* iStrictLocking */
True, /* bPosixLocking */
True, /* bShareModes */
True, /* bOpLocks */
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 0a3fc27be6..0524078310 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5221,7 +5221,7 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
/* 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) {