diff options
| author | Björn Baumbach <bb@sernet.de> | 2011-07-11 11:19:21 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-11 12:48:38 +0200 |
| commit | f2c5a0afd2e219e8d845db08d6d13de65b710f5c (patch) | |
| tree | acfc76e62682b00e4c552dc7f28c7d47f86de4b7 /source3/torture | |
| parent | 57194d8c5d47133c9145e6ed2b51f4e18f8bd1ec (diff) | |
| download | samba-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/torture')
| -rw-r--r-- | source3/torture/locktest.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index d27eb5fa54..a5ccf24c33 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -289,17 +289,16 @@ static bool test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], uint64_t len = rec->len; enum brl_type op = rec->lock_type; int server; - bool ret[NSERVERS]; NTSTATUS status[NSERVERS]; switch (rec->lock_op) { case OP_LOCK: /* set a lock */ for (server=0;server<NSERVERS;server++) { - ret[server] = cli_lock64(cli[server][conn], - fnum[server][conn][f], - start, len, LOCK_TIMEOUT, op); - status[server] = cli_nt_error(cli[server][conn]); + status[server] = cli_lock64(cli[server][conn], + fnum[server][conn][f], + start, len, LOCK_TIMEOUT, + op); if (!exact_error_codes && NT_STATUS_EQUAL(status[server], NT_STATUS_FILE_LOCK_CONFLICT)) { @@ -320,10 +319,9 @@ static bool test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], case OP_UNLOCK: /* unset a lock */ for (server=0;server<NSERVERS;server++) { - ret[server] = NT_STATUS_IS_OK(cli_unlock64(cli[server][conn], - fnum[server][conn][f], - start, len)); - status[server] = cli_nt_error(cli[server][conn]); + status[server] = cli_unlock64(cli[server][conn], + fnum[server][conn][f], + start, len); } if (showall || (!hide_unlock_fails && !NT_STATUS_EQUAL(status[0],status[1]))) { |