summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-10 08:52:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:55 -0500
commit70656780add642ae390c5be48255bd99af915445 (patch)
treee2fb925e3e819185c1d410b396d9b1484c16b702 /source4
parent0f8d452ca020ece761872721e19e62ae0fc21582 (diff)
downloadsamba-70656780add642ae390c5be48255bd99af915445.tar.gz
samba-70656780add642ae390c5be48255bd99af915445.tar.bz2
samba-70656780add642ae390c5be48255bd99af915445.zip
r7459: fixed pvfs for the RAW-MUX test
when you cancel a lock, w2k3 gives NT_STATUS_FILE_LOCK_CONFLICT not NT_STATUS_CANCELLED. Strange. (This used to be commit a4f17fcd9218f16b6cc166b2f797e8889d6f63f4)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 8015fc46c4..e803ce3d41 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -118,7 +118,7 @@ static void pvfs_pending_lock_continue(void *private, enum pvfs_wait_notice reas
/* we don't retry on a cancel */
if (reason == PVFS_WAIT_CANCEL) {
- status = NT_STATUS_CANCELLED;
+ status = NT_STATUS_FILE_LOCK_CONFLICT;
} else {
status = brl_lock(pvfs->brl_context,
&f->handle->brl_locking_key,