diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-12-31 05:33:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:11 -0500 |
| commit | ca2f6f69d96fc80c26b54ae82617abaa15efef45 (patch) | |
| tree | f4f43fba132cac4299e00159bd32717630935bfb | |
| parent | 767ce19bf8bf75b2ede9bd5c7cd5a6112b6e7acd (diff) | |
| download | samba-ca2f6f69d96fc80c26b54ae82617abaa15efef45.tar.gz samba-ca2f6f69d96fc80c26b54ae82617abaa15efef45.tar.bz2 samba-ca2f6f69d96fc80c26b54ae82617abaa15efef45.zip | |
r12636: fixed some torture code for the changed lsa string types
(This used to be commit ce77c0e8bf4127027edd6291d2ae5d868e3372a1)
| -rw-r--r-- | source4/torture/rpc/lsa.c | 8 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 0207c756bd..25c73a3fde 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -779,14 +779,14 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p, 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 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p, } 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 @@ static BOOL test_query_each_TrustDom(struct dcerpc_pipe *p, 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); diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 210e5def21..3fe622b592 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -2262,7 +2262,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 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)) { |