summaryrefslogtreecommitdiffstats
path: root/source3/locking
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-09-04 07:13:01 +0000
committerAndrew Tridgell <tridge@samba.org>2001-09-04 07:13:01 +0000
commit19fea3242cf6234786b6cbb60631e0071f31ff9f (patch)
tree1de6e79890a80a1e03cf0dce5813513aaf51bc59 /source3/locking
parent55cf37488f66eba2826dba08e80dd4ab6df33fc3 (diff)
downloadsamba-19fea3242cf6234786b6cbb60631e0071f31ff9f.tar.gz
samba-19fea3242cf6234786b6cbb60631e0071f31ff9f.tar.xz
samba-19fea3242cf6234786b6cbb60631e0071f31ff9f.zip
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work
(This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/locking.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 4928d6d1606..1ed238f4d8c 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -105,7 +105,7 @@ NTSTATUS do_lock(files_struct *fsp,connection_struct *conn, uint16 lock_pid,
BOOL ok = False;
if (!lp_locking(SNUM(conn)))
- return NT_STATUS(0);
+ return NT_STATUS_OK;
/* NOTE! 0 byte long ranges ARE allowed and should be stored */
@@ -156,10 +156,10 @@ NTSTATUS do_unlock(files_struct *fsp,connection_struct *conn, uint16 lock_pid,
BOOL ok = False;
if (!lp_locking(SNUM(conn)))
- return NT_STATUS(0);
+ return NT_STATUS_OK;
if (!OPEN_FSP(fsp) || !fsp->can_lock || (fsp->conn != conn)) {
- return NT_STATUS(NT_STATUS_INVALID_HANDLE);
+ return NT_STATUS_INVALID_HANDLE;
}
DEBUG(10,("do_unlock: unlock start=%.0f len=%.0f requested for file %s\n",
@@ -176,15 +176,15 @@ NTSTATUS do_unlock(files_struct *fsp,connection_struct *conn, uint16 lock_pid,
if (!ok) {
DEBUG(10,("do_unlock: returning ERRlock.\n" ));
- return NT_STATUS(NT_STATUS_LOCK_NOT_GRANTED);
+ return NT_STATUS_LOCK_NOT_GRANTED;
}
if (!lp_posix_locking(SNUM(conn)))
- return NT_STATUS(0);
+ return NT_STATUS_OK;
(void)release_posix_lock(fsp, offset, count);
- return NT_STATUS(0);
+ return NT_STATUS_OK;
}
/****************************************************************************