r8120: added in the newly found DOS locking error codes into the pvfs backend

(This used to be commit d77b3820d16f60fb9119ac6eb70007363990b20d)

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index e803ce3d41295e6c08dadcc089181a6283d25b96..a0832723b601f52a67f3321dd2d4959f63c350ca 100644 (file)
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -263,7 +263,7 @@ static NTSTATUS pvfs_lock_cancel(struct pvfs_state *pvfs, struct smbsrv_request
                }
        }
 
-       return NT_STATUS_UNSUCCESSFUL;
+       return NT_STATUS_DOS(ERRDOS, ERRcancelviolation);
 }
 
 
@@ -324,7 +324,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
        if (lck->lockx.in.mode & LOCKING_ANDX_CHANGE_LOCKTYPE) {
                /* this seems to not be supported by any windows server,
                   or used by any clients */
-               return NT_STATUS_UNSUCCESSFUL;
+               return NT_STATUS_DOS(ERRDOS, ERRnoatomiclocks);
        }
 
        if (lck->lockx.in.mode & LOCKING_ANDX_OPLOCK_RELEASE) {

diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index 3574a305834cf3b11b4f7dd28c82575e672cc289..c363388408864e7e39b0a2a242023c11576becfb 100644 (file)
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -181,5 +181,5 @@ NTSTATUS pvfs_cancel(struct ntvfs_module_context *ntvfs, struct smbsrv_request *
                }
        }
 
-       return NT_STATUS_UNSUCCESSFUL;
+       return NT_STATUS_DOS(ERRDOS, ERRcancelviolation);
 }