diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-11-13 13:45:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:47 -0500 |
| commit | 50916c8f2fd3e1c8e56b74bbed95d72f328637bc (patch) | |
| tree | 34c110d378367a45fe05ed5682f3a6eeecaa52d8 /source4/torture/rpc/testjoin.c | |
| parent | d309966e3191405f5a17555c394b4a1934fbfcab (diff) | |
| download | samba-50916c8f2fd3e1c8e56b74bbed95d72f328637bc.tar.gz samba-50916c8f2fd3e1c8e56b74bbed95d72f328637bc.tar.bz2 samba-50916c8f2fd3e1c8e56b74bbed95d72f328637bc.zip | |
r3724: Rename a number of structures, for better consistance between SAMR and
NETLOGON.
In particular, rename samr_Name to samr_String - given that many
strings in this pipe are not 'names', the previous was just confusing.
(I look forward to PIDL turning these into simple char * some day...).
Also export out a few changes from testjoin.c to allow for how I have
written the new RPC-SAMSYNC test.
Andrew Bartlett
(This used to be commit 9cd666bcfb1fc752a4717010a7c4f05131dc728e)
Diffstat (limited to 'source4/torture/rpc/testjoin.c')
| -rw-r--r-- | source4/torture/rpc/testjoin.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 55f508941d..1815bb9ddb 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -43,10 +43,10 @@ static NTSTATUS DeleteUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle user_handle; uint32_t rid; struct samr_LookupNames n; - struct samr_Name sname; + struct samr_String sname; struct samr_OpenUser r; - sname.name = name; + sname.string = name; n.in.domain_handle = handle; n.in.num_names = 1; @@ -103,7 +103,7 @@ struct test_join *torture_join_domain(const char *machine_name, uint32_t access_granted; uint32_t rid; DATA_BLOB session_key; - struct samr_Name name; + struct samr_String name; int policy_min_pw_len = 0; struct test_join *join; @@ -140,7 +140,7 @@ struct test_join *torture_join_domain(const char *machine_name, printf("Opening domain %s\n", domain); - name.name = domain; + name.string = domain; l.in.connect_handle = &handle; l.in.domain = &name; @@ -164,7 +164,7 @@ struct test_join *torture_join_domain(const char *machine_name, printf("Creating machine account %s\n", machine_name); again: - name.name = talloc_asprintf(join, "%s$", machine_name); + name.string = talloc_asprintf(join, "%s$", machine_name); r.in.domain_handle = &domain_handle; r.in.account_name = &name; r.in.acct_flags = acct_flags; @@ -176,7 +176,7 @@ again: status = dcerpc_samr_CreateUser2(join->p, join, &r); if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) { - status = DeleteUser_byname(join->p, join, &domain_handle, name.name); + status = DeleteUser_byname(join->p, join, &domain_handle, name.string); if (NT_STATUS_IS_OK(status)) { goto again; } @@ -238,6 +238,7 @@ again: if (machine_password) { *machine_password = join->machine_password; } + return join; failed: @@ -245,6 +246,10 @@ failed: return NULL; } +struct dcerpc_pipe *torture_join_samr_pipe(struct test_join *join) +{ + return join->p; +} /* leave the domain, deleting the machine acct |