1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

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

return for one of the Samba4 torture tests.
Jeremy.
This commit is contained in:
Jeremy Allison 2006-04-17 22:32:38 +00:00 committed by Gerald (Jerry) Carter
parent 634e0dc3c7
commit 9db6617756
2 changed files with 2 additions and 2 deletions

View File

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

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
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) {