summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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) {