summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-07-11 11:19:21 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-11 12:48:38 +0200
commitf2c5a0afd2e219e8d845db08d6d13de65b710f5c (patch)
treeacfc76e62682b00e4c552dc7f28c7d47f86de4b7 /source3/libsmb
parent57194d8c5d47133c9145e6ed2b51f4e18f8bd1ec (diff)
downloadsamba-f2c5a0afd2e219e8d845db08d6d13de65b710f5c.tar.gz
samba-f2c5a0afd2e219e8d845db08d6d13de65b710f5c.tar.bz2
samba-f2c5a0afd2e219e8d845db08d6d13de65b710f5c.zip
s3-libsmb: let cli_lock64 return NTSTATUS instead of bool
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Mon Jul 11 12:48:38 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clifile.c10
-rw-r--r--source3/libsmb/proto.h5
2 files changed, 8 insertions, 7 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 948d10499d..a5be74803c 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -2721,9 +2721,9 @@ NTSTATUS cli_unlock(struct cli_state *cli,
Lock a file with 64 bit offsets.
****************************************************************************/
-bool cli_lock64(struct cli_state *cli, uint16_t fnum,
- uint64_t offset, uint64_t len, int timeout,
- enum brl_type lock_type)
+NTSTATUS cli_lock64(struct cli_state *cli, uint16_t fnum,
+ uint64_t offset, uint64_t len, int timeout,
+ enum brl_type lock_type)
{
uint16_t vwv[8];
uint8_t bytes[20];
@@ -2732,7 +2732,7 @@ bool cli_lock64(struct cli_state *cli, uint16_t fnum,
NTSTATUS status;
if (! (cli->capabilities & CAP_LARGE_FILES)) {
- return cli_lock(cli, fnum, offset, len, timeout, lock_type);
+ return cli_lock32(cli, fnum, offset, len, timeout, lock_type);
}
ltype = (lock_type == READ_LOCK? 1 : 0);
@@ -2764,7 +2764,7 @@ bool cli_lock64(struct cli_state *cli, uint16_t fnum,
cli->timeout = saved_timeout;
- return NT_STATUS_IS_OK(status);
+ return status;
}
/****************************************************************************
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 906852e94f..151df40436 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -400,8 +400,9 @@ struct tevent_req *cli_unlock_send(TALLOC_CTX *mem_ctx,
uint64_t len);
NTSTATUS cli_unlock_recv(struct tevent_req *req);
NTSTATUS cli_unlock(struct cli_state *cli, uint16_t fnum, uint32_t offset, uint32_t len);
-bool cli_lock64(struct cli_state *cli, uint16_t fnum,
- uint64_t offset, uint64_t len, int timeout, enum brl_type lock_type);
+NTSTATUS cli_lock64(struct cli_state *cli, uint16_t fnum,
+ uint64_t offset, uint64_t len, int timeout,
+ enum brl_type lock_type);
struct tevent_req *cli_unlock64_send(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct cli_state *cli,