svn commit: samba r25285 - in branches: SAMBA_3_2/source/rpcclient SAMBA_3_2_0/source/rpcclient

obnox at samba.org obnox at samba.org
Fri Sep 21 11:53:15 GMT 2007


Author: obnox
Date: 2007-09-21 11:53:14 +0000 (Fri, 21 Sep 2007)
New Revision: 25285

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25285

Log:
Fix some more callers of unistr2_to_ascii to use the size of
destination instead of source as maxlen.

Michael


Modified:
   branches/SAMBA_3_2/source/rpcclient/cmd_lsarpc.c
   branches/SAMBA_3_2_0/source/rpcclient/cmd_lsarpc.c


Changeset:
Modified: branches/SAMBA_3_2/source/rpcclient/cmd_lsarpc.c
===================================================================
--- branches/SAMBA_3_2/source/rpcclient/cmd_lsarpc.c	2007-09-21 11:51:04 UTC (rev 25284)
+++ branches/SAMBA_3_2/source/rpcclient/cmd_lsarpc.c	2007-09-21 11:53:14 UTC (rev 25285)
@@ -96,7 +96,7 @@
 {
 	fstring name;
 
-	unistr2_to_ascii(name, &d.uni_domain_name, d.uni_dom_max_len);
+	unistr2_to_ascii(name, &d.uni_domain_name, sizeof(name));
 
 	d_printf("Domain Name: %s\n", name);
 	d_printf("Domain Sid: %s\n", sid_string_static(&d.dom_sid.sid));
@@ -118,9 +118,9 @@
 {
 	fstring dom_name, dns_dom_name, forest_name;
 
-	unistr2_to_ascii(dom_name, &d.uni_nb_dom_name, d.hdr_nb_dom_name.uni_max_len);
-	unistr2_to_ascii(dns_dom_name, &d.uni_dns_dom_name, d.hdr_dns_dom_name.uni_max_len);
-	unistr2_to_ascii(forest_name, &d.uni_forest_name, d.hdr_forest_name.uni_max_len);
+	unistr2_to_ascii(dom_name, &d.uni_nb_dom_name, sizeof(dom_name));
+	unistr2_to_ascii(dns_dom_name, &d.uni_dns_dom_name, sizeof(dns_dom_name));
+	unistr2_to_ascii(forest_name, &d.uni_forest_name, sizeof(forest_name));
 
 	d_printf("Domain NetBios Name: %s\n", dom_name);
 	d_printf("Domain DNS Name: %s\n", dns_dom_name);

Modified: branches/SAMBA_3_2_0/source/rpcclient/cmd_lsarpc.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpcclient/cmd_lsarpc.c	2007-09-21 11:51:04 UTC (rev 25284)
+++ branches/SAMBA_3_2_0/source/rpcclient/cmd_lsarpc.c	2007-09-21 11:53:14 UTC (rev 25285)
@@ -96,7 +96,7 @@
 {
 	fstring name;
 
-	unistr2_to_ascii(name, &d.uni_domain_name, d.uni_dom_max_len);
+	unistr2_to_ascii(name, &d.uni_domain_name, sizeof(name));
 
 	d_printf("Domain Name: %s\n", name);
 	d_printf("Domain Sid: %s\n", sid_string_static(&d.dom_sid.sid));
@@ -118,9 +118,9 @@
 {
 	fstring dom_name, dns_dom_name, forest_name;
 
-	unistr2_to_ascii(dom_name, &d.uni_nb_dom_name, d.hdr_nb_dom_name.uni_max_len);
-	unistr2_to_ascii(dns_dom_name, &d.uni_dns_dom_name, d.hdr_dns_dom_name.uni_max_len);
-	unistr2_to_ascii(forest_name, &d.uni_forest_name, d.hdr_forest_name.uni_max_len);
+	unistr2_to_ascii(dom_name, &d.uni_nb_dom_name, sizeof(dom_name));
+	unistr2_to_ascii(dns_dom_name, &d.uni_dns_dom_name, sizeof(dns_dom_name));
+	unistr2_to_ascii(forest_name, &d.uni_forest_name, sizeof(forest_name));
 
 	d_printf("Domain NetBios Name: %s\n", dom_name);
 	d_printf("Domain DNS Name: %s\n", dns_dom_name);



More information about the samba-cvs mailing list