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)

diff --git a/source4/client/client.c b/source4/client/client.c
index 376403917aea4bb9f720e81a84ab460ec4aaee57..f9fbbab6ece21558817807cdf0ba8d7d4588fd88 100644 (file)
--- 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 dde6b673a0c04f9780d4e53a445661fe8fa616f5..20e6d6df31723d938793337c3388d5f8e237fafa 100644 (file)
--- 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 0c39abe8801c8532f46710fc0f4b9173d9381dc5..53f8075822a6b6920e696cf3b086efb5f7b0b094 100644 (file)
--- 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);