Author: metze Date: 2007-05-14 17:51:19 +0000 (Mon, 14 May 2007) New Revision: 22863
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22863 Log: in SMB2 mode we always need to return NT_STATUS_LOCK_NOT_GRANTED metze Modified: branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c Changeset: Modified: branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c =================================================================== --- branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c 2007-05-14 17:40:55 UTC (rev 22862) +++ branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c 2007-05-14 17:51:19 UTC (rev 22863) @@ -28,6 +28,7 @@ #include "lib/messaging/irpc.h" #include "libcli/libcli.h" #include "cluster/cluster.h" +#include "ntvfs/ntvfs.h" #include "ntvfs/common/brlock.h" #include "include/ctdb.h" @@ -242,6 +243,11 @@ * this function is only called for non pending lock! */ + /* in SMB2 mode always return NT_STATUS_LOCK_NOT_GRANTED! */ + if (lock->ntvfs->ctx->protocol == PROTOCOL_SMB2) { + return NT_STATUS_LOCK_NOT_GRANTED; + } + /* * if the notify_ptr is non NULL, * it means that we're at the end of a pending lock Modified: branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c =================================================================== --- branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c 2007-05-14 17:40:55 UTC (rev 22862) +++ branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c 2007-05-14 17:51:19 UTC (rev 22863) @@ -34,6 +34,7 @@ #include "libcli/libcli.h" #include "cluster/cluster.h" #include "ntvfs/common/brlock.h" +#include "ntvfs/ntvfs.h" /* in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies @@ -220,6 +221,11 @@ * this function is only called for non pending lock! */ + /* in SMB2 mode always return NT_STATUS_LOCK_NOT_GRANTED! */ + if (lock->ntvfs->ctx->protocol == PROTOCOL_SMB2) { + return NT_STATUS_LOCK_NOT_GRANTED; + } + /* * if the notify_ptr is non NULL, * it means that we're at the end of a pending lock
