summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-02-13 00:26:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:46 -0500
commitabc28d66e9c472300271cb250313b3e8d0293abd (patch)
tree07f25928c52cbb68d4484d1e68bfac6e473be538 /source4/torture
parent2f8478b27d4929d5f7ea8f92f61df57dd869ede6 (diff)
downloadsamba-abc28d66e9c472300271cb250313b3e8d0293abd.tar.gz
samba-abc28d66e9c472300271cb250313b3e8d0293abd.tar.bz2
samba-abc28d66e9c472300271cb250313b3e8d0293abd.zip
r5364: Rename string fields called 'domain' and 'name' to be 'domain_name'.
(This used to be commit 6749b9404d4e9876ecd964e038c608f05d2c0b69)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/samr.c24
-rw-r--r--source4/torture/rpc/samsync.c2
-rw-r--r--source4/torture/rpc/schannel.c4
-rw-r--r--source4/torture/rpc/testjoin.c2
-rw-r--r--source4/torture/rpc/xplogin.c4
5 files changed, 18 insertions, 18 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 31380c109a..49c18ea0f4 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -685,8 +685,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct samr_GetDomPwInfo r;
BOOL ret = True;
- r.in.name = domain_name;
- printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+ r.in.domain_name = domain_name;
+ printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
@@ -694,8 +694,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
ret = False;
}
- r.in.name->string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
- printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+ r.in.domain_name->string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+ printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
@@ -703,8 +703,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
ret = False;
}
- r.in.name->string = "\\\\__NONAME__";
- printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+ r.in.domain_name->string = "\\\\__NONAME__";
+ printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
@@ -712,8 +712,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
ret = False;
}
- r.in.name->string = "\\\\Builtin";
- printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+ r.in.domain_name->string = "\\\\Builtin";
+ printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
@@ -958,7 +958,7 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
struct samr_String domain_name;
domain_name.string = "";
- dom_pw_info.in.name = &domain_name;
+ dom_pw_info.in.domain_name = &domain_name;
printf("Testing OemChangePasswordUser2\n");
@@ -1015,7 +1015,7 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct samr_String domain_name;
domain_name.string = "";
- dom_pw_info.in.name = &domain_name;
+ dom_pw_info.in.domain_name = &domain_name;
printf("Testing ChangePasswordUser2\n");
@@ -2966,7 +2966,7 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
/* check for correct error codes */
r.in.connect_handle = handle;
- r.in.domain = &n2;
+ r.in.domain_name = &n2;
n2.string = NULL;
status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
@@ -2984,7 +2984,7 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
}
r.in.connect_handle = handle;
- r.in.domain = domain;
+ r.in.domain_name = domain;
status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 3fc916450f..f1cbad2f05 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -143,7 +143,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
name.string = domain;
l.in.connect_handle = samsync_state->connect_handle;
- l.in.domain = &name;
+ l.in.domain_name = &name;
nt_status = dcerpc_samr_LookupDomain(samsync_state->p_samr, mem_ctx, &l);
if (!NT_STATUS_IS_OK(nt_status)) {
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 26f186e912..820dfaf4a5 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -37,9 +37,9 @@ static BOOL test_samr_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
struct samr_String name;
name.string = lp_workgroup();
- r.in.name = &name;
+ r.in.domain_name = &name;
- printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+ printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
/* do several ops to test credential chaining */
for (i=0;i<5;i++) {
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 8668632179..3921afb074 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -142,7 +142,7 @@ struct test_join *torture_join_domain(const char *machine_name,
name.string = domain;
l.in.connect_handle = &handle;
- l.in.domain = &name;
+ l.in.domain_name = &name;
status = dcerpc_samr_LookupDomain(join->p, join, &l);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c
index 8915417995..c64825852c 100644
--- a/source4/torture/rpc/xplogin.c
+++ b/source4/torture/rpc/xplogin.c
@@ -659,7 +659,7 @@ static NTSTATUS test_getgroups(struct smbcli_transport *transport,
continue;
l.in.connect_handle = &connect_handle;
- l.in.domain = &e.out.sam->entries[i].name;
+ l.in.domain_name = &e.out.sam->entries[i].name;
status = dcerpc_samr_LookupDomain(p, mem_ctx, &l);
@@ -823,7 +823,7 @@ static NTSTATUS test_getallsids(struct smbcli_transport *transport,
continue;
l.in.connect_handle = &connect_handle;
- l.in.domain = &e.out.sam->entries[i].name;
+ l.in.domain_name = &e.out.sam->entries[i].name;
status = dcerpc_samr_LookupDomain(p, mem_ctx, &l);