svn commit: samba r1941 - in branches/SAMBA_4_0/source: client libcli/raw

tridge at samba.org tridge at samba.org
Fri Aug 20 00:03:13 GMT 2004


Author: tridge
Date: 2004-08-20 00:03:13 +0000 (Fri, 20 Aug 2004)
New Revision: 1941

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1941&nolog=1

Log:
- 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

Modified:
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/libcli/raw/rawacl.c
   branches/SAMBA_4_0/source/libcli/raw/rawtrans.c


Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c	2004-08-19 22:47:15 UTC (rev 1940)
+++ branches/SAMBA_4_0/source/client/client.c	2004-08-20 00:03:13 UTC (rev 1941)
@@ -1777,6 +1777,8 @@
 		goto done;
 	}
 
+	NDR_PRINT_DEBUG(security_descriptor, query.out.sd);
+
 	talloc_destroy(mem_ctx);
 
 done:

Modified: branches/SAMBA_4_0/source/libcli/raw/rawacl.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawacl.c	2004-08-19 22:47:15 UTC (rev 1940)
+++ branches/SAMBA_4_0/source/libcli/raw/rawacl.c	2004-08-20 00:03:13 UTC (rev 1941)
@@ -78,7 +78,7 @@
 		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;
 	}

Modified: branches/SAMBA_4_0/source/libcli/raw/rawtrans.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawtrans.c	2004-08-19 22:47:15 UTC (rev 1940)
+++ branches/SAMBA_4_0/source/libcli/raw/rawtrans.c	2004-08-20 00:03:13 UTC (rev 1941)
@@ -480,6 +480,10 @@
 	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);



More information about the samba-cvs mailing list