summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-08-20 00:03:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:12 -0500
commit8d6e233f66616c97fcce935253e56cdd6117242e (patch)
treed25c7a4e944e3dbc683e46899e47d95b4cf4f33b /source4/libcli
parent454e76dec2c105ba84c2f644ded849f8dff9f4a9 (diff)
downloadsamba-8d6e233f66616c97fcce935253e56cdd6117242e.tar.gz
samba-8d6e233f66616c97fcce935253e56cdd6117242e.tar.bz2
samba-8d6e233f66616c97fcce935253e56cdd6117242e.zip
r1941: - fixed an allocation error with querying security descriptors remotely
- print the received security_descriptor in the smbclient "acl" command - make sure we zero the alignment data in nttrans packet sends (This used to be commit 8925b8b2193905d084e1bfaaa3235ed7f9d1eb55)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/raw/rawacl.c2
-rw-r--r--source4/libcli/raw/rawtrans.c4
2 files changed, 5 insertions, 1 deletions
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);