summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/client/client.c2
-rw-r--r--source4/libcli/raw/rawacl.c2
-rw-r--r--source4/libcli/raw/rawtrans.c4
3 files changed, 7 insertions, 1 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index 376403917a..f9fbbab6ec 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -1777,6 +1777,8 @@ static int cmd_acl(void)
goto done;
}
+ NDR_PRINT_DEBUG(security_descriptor, query.out.sd);
+
talloc_destroy(mem_ctx);
done:
diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index dde6b673a0..20e6d6df31 100644
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -78,7 +78,7 @@ NTSTATUS smb_raw_query_secdesc_recv(struct smbcli_request *req,
return NT_STATUS_INVALID_PARAMETER;
}
- query->out.sd = talloc(mem_ctx, sizeof(query->out.sd));
+ query->out.sd = talloc_p(mem_ctx, struct security_descriptor);
if (!query->out.sd) {
return NT_STATUS_NO_MEMORY;
}
diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c
index 0c39abe880..53f8075822 100644
--- a/source4/libcli/raw/rawtrans.c
+++ b/source4/libcli/raw/rawtrans.c
@@ -480,6 +480,10 @@ struct smbcli_request *smb_raw_nttrans_send(struct smbcli_tree *tree,
outparam = req->out.data + align;
outdata = outparam + parms->in.params.length;
+ if (align != 0) {
+ memset(req->out.data, 0, align);
+ }
+
SCVAL(req->out.vwv, 0, parms->in.max_setup);
SSVAL(req->out.vwv, 1, 0); /* reserved */
SIVAL(req->out.vwv, 3, parms->in.params.length);