diff options
| author | Jeremy Allison <jra@samba.org> | 2006-04-17 22:32:38 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2006-04-17 22:32:38 +0000 |
| commit | 88cba3dcd84933c4a1e476dacb7ce9b77d194ddd (patch) | |
| tree | f8aaf8fc271f7ced91157273c8360c3eb1ee0932 | |
| parent | 8152842d9558a4c96a16b5894b6f81d57e6fa212 (diff) | |
| download | samba-88cba3dcd84933c4a1e476dacb7ce9b77d194ddd.tar.gz | |
r15112: Move strict locking default to auto. Fix up the error
return for one of the Samba4 torture tests.
Jeremy.
| -rw-r--r-- | source/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source/smbd/reply.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index af4293a11e8..e0cbc981def 100644 --- a/source/param/loadparm.c +++ b/source/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/source/smbd/reply.c b/source/smbd/reply.c index 0a3fc27be63..0524078310f 100644 --- a/source/smbd/reply.c +++ b/source/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) { |