summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-01-16 19:20:43 +0100
committerVolker Lendecke <vl@samba.org>2011-01-17 08:03:43 +0100
commit7b054ecaed589ed4228fe5cd5680540f8fef201d (patch)
tree45076e1e56ce5ac2cd3c2491dd30c4bd2c427150
parentb33f1147a6074b547a908b6c07fe2d4679c36383 (diff)
downloadsamba-7b054ecaed589ed4228fe5cd5680540f8fef201d.tar.gz
samba-7b054ecaed589ed4228fe5cd5680540f8fef201d.tar.bz2
samba-7b054ecaed589ed4228fe5cd5680540f8fef201d.zip
s3: Make passing up "result_parent" from cli_smb optional
-rw-r--r--source3/libsmb/clientgen.c2
-rw-r--r--source3/libsmb/clifile.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 3fb1c7fc7f..3816419dfd 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -954,7 +954,7 @@ NTSTATUS cli_smb(TALLOC_CTX *mem_ctx, struct cli_state *cli,
pnum_bytes, pbytes);
fail:
TALLOC_FREE(ev);
- if (NT_STATUS_IS_OK(status)) {
+ if (NT_STATUS_IS_OK(status) && (result_parent != NULL)) {
*result_parent = req;
}
return status;
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f68c99fc71..1b92dd8360 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4082,14 +4082,13 @@ NTSTATUS cli_raw_ioctl(struct cli_state *cli, uint16_t fnum, uint32_t code, DATA
{
uint16_t vwv[3];
NTSTATUS status;
- struct tevent_req *result_parent;
SSVAL(vwv+0, 0, fnum);
SSVAL(vwv+1, 0, code>>16);
SSVAL(vwv+2, 0, (code&0xFFFF));
status = cli_smb(talloc_tos(), cli, SMBioctl, 0, 3, vwv, 0, NULL,
- &result_parent, 0, NULL, NULL, NULL, NULL);
+ NULL, 0, NULL, NULL, NULL, NULL);
if (!NT_STATUS_IS_OK(status)) {
return status;
}