summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-04 05:08:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:11 -0500
commitafe376bfc71f7dc157791643497792afee33f05d (patch)
treec74daef1bb0f5c1591e5d1208a48fc6cd55af064
parent8086371dbfe232bc3c3752f9aa9b7d2ad2de45bf (diff)
downloadsamba-afe376bfc71f7dc157791643497792afee33f05d.tar.gz
samba-afe376bfc71f7dc157791643497792afee33f05d.tar.bz2
samba-afe376bfc71f7dc157791643497792afee33f05d.zip
r8120: added in the newly found DOS locking error codes into the pvfs backend
(This used to be commit d77b3820d16f60fb9119ac6eb70007363990b20d)
-rw-r--r--source4/ntvfs/posix/pvfs_lock.c4
-rw-r--r--source4/ntvfs/posix/pvfs_wait.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index e803ce3d41..a0832723b6 100644
--- 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 3574a30583..c363388408 100644
--- 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);
}