svn commit: samba r7459 - in branches/SAMBA_4_0/source/ntvfs/posix: .

[tridge]

Author: tridge
Date: 2005-06-10 08:52:26 +0000 (Fri, 10 Jun 2005)
New Revision: 7459

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7459

Log:
fixed pvfs for the RAW-MUX test

when you cancel a lock, w2k3 gives NT_STATUS_FILE_LOCK_CONFLICT not
NT_STATUS_CANCELLED. Strange.

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c   2005-06-10 08:24:34 UTC 
(rev 7458)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c   2005-06-10 08:52:26 UTC 
(rev 7459)
@@ -118,7 +118,7 @@
 
        /* 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,