svn commit: samba r12636 - in branches/SAMBA_4_0/source/torture/rpc: .

tridge at samba.org tridge at samba.org
Sat Dec 31 05:33:50 GMT 2005


Author: tridge
Date: 2005-12-31 05:33:50 +0000 (Sat, 31 Dec 2005)
New Revision: 12636

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

Log:

fixed some torture code for the changed lsa string types

Modified:
   branches/SAMBA_4_0/source/torture/rpc/lsa.c
   branches/SAMBA_4_0/source/torture/rpc/samr.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/lsa.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/lsa.c	2005-12-31 04:31:02 UTC (rev 12635)
+++ branches/SAMBA_4_0/source/torture/rpc/lsa.c	2005-12-31 05:33:50 UTC (rev 12636)
@@ -779,14 +779,14 @@
 static BOOL test_DeleteTrustedDomain(struct dcerpc_pipe *p, 
 				     TALLOC_CTX *mem_ctx, 
 				     struct policy_handle *handle,
-				     struct lsa_String name)
+				     struct lsa_StringLarge name)
 {
 	NTSTATUS status;
 	struct lsa_OpenTrustedDomainByName r;
 	struct policy_handle trustdom_handle;
 
 	r.in.handle = handle;
-	r.in.name = name;
+	r.in.name.string = name.string;
 	r.in.access_mask = SEC_STD_DELETE;
 	r.out.trustdom_handle = &trustdom_handle;
 
@@ -1466,7 +1466,7 @@
 		}
 
 		trust_by_name.in.handle = handle;
-		trust_by_name.in.name = domains->domains[i].name;
+		trust_by_name.in.name.string = domains->domains[i].name.string;
 		trust_by_name.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 		trust_by_name.out.trustdom_handle = &trustdom_handle;
 			
@@ -1524,7 +1524,7 @@
 			struct lsa_QueryTrustedDomainInfoByName q;
 			union lsa_TrustedDomainInfo info;
 			q.in.handle         = handle;
-			q.in.trusted_domain = domains->domains[i].name;
+			q.in.trusted_domain.string = domains->domains[i].name.string;
 			q.in.level          = levels[j];
 			q.out.info          = &info;
 			status = dcerpc_lsa_QueryTrustedDomainInfoByName(p, mem_ctx, &q);

Modified: branches/SAMBA_4_0/source/torture/rpc/samr.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samr.c	2005-12-31 04:31:02 UTC (rev 12635)
+++ branches/SAMBA_4_0/source/torture/rpc/samr.c	2005-12-31 05:33:50 UTC (rev 12636)
@@ -2262,7 +2262,7 @@
 	n.in.num_names = r.out.sam->count;
 	n.in.names = talloc_array(mem_ctx, struct lsa_String, r.out.sam->count);
 	for (i=0;i<r.out.sam->count;i++) {
-		n.in.names[i] = r.out.sam->entries[i].name;
+		n.in.names[i].string = r.out.sam->entries[i].name.string;
 	}
 	status = dcerpc_samr_LookupNames(p, mem_ctx, &n);
 	if (!NT_STATUS_IS_OK(status)) {



More information about the samba-cvs mailing list