sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r15112: Move strict locking default to auto. Fix up the error

Browse Source 
return for one of the Samba4 torture tests.
Jeremy.
(This used to be commit 9db6617756)
This commit is contained in:
Jeremy Allison 2006-04-17 22:32:38 +00:00 committed by Gerald (Jerry) Carter
parent a3fdf8ac21
commit 5445694eb9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/param/loadparm.c
View File

@ -551,7 +551,7 @@ static service sDefault = {
False, /* bStoreDosAttributes */ False, /* bStoreDosAttributes */
False, /* bDmapiSupport */ False, /* bDmapiSupport */
True, /* bLocking */ True, /* bLocking */
True, /* iStrictLocking */ Auto, /* iStrictLocking */
True, /* bPosixLocking */ True, /* bPosixLocking */
True, /* bShareModes */ True, /* bShareModes */
True, /* bOpLocks */ True, /* bOpLocks */

2
source3/smbd/reply.c
View File

@ -5221,7 +5221,7 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
/* we don't support these - and CANCEL_LOCK makes w2k /* we don't support these - and CANCEL_LOCK makes w2k
and XP reboot so I don't really want to be and XP reboot so I don't really want to be
compatible! (tridge) */ compatible! (tridge) */
return ERROR_DOS(ERRDOS, ERRnoatomiclocks); return ERROR_FORCE_DOS(ERRDOS, ERRnoatomiclocks);
} }
if (locktype & LOCKING_ANDX_CANCEL_LOCK) { if (locktype & LOCKING_ANDX_CANCEL_LOCK) {