summaryrefslogtreecommitdiff
path: root/source4/torture/rpc/join.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-10-03 23:46:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:20 -0500
commit099c3d532736d5836d0d5d3236cd1e502897076c (patch)
tree794c93933c694ffc92386cdea8fc0c56ba78b97e /source4/torture/rpc/join.c
parentb7a47635caeb326cc8a5c2bd2307334a4a2ff416 (diff)
downloadsamba-099c3d532736d5836d0d5d3236cd1e502897076c.tar.gz
samba-099c3d532736d5836d0d5d3236cd1e502897076c.tar.bz2
samba-099c3d532736d5836d0d5d3236cd1e502897076c.zip
r10697: Change the torture join code to return a credentials structure, as
that is what most of the callers want anyway. Remove and re-add the account for the torture case, rather than just modify it. Test with a user account (needs work to change the password). Andrew Bartlett (This used to be commit 38bebef02454164cbe882347d80e03abee656205)
Diffstat (limited to 'source4/torture/rpc/join.c')
-rw-r--r--source4/torture/rpc/join.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index beb313c3d2..7aed76abf4 100644
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -9,12 +9,12 @@
BOOL torture_rpc_join(void)
{
struct test_join *tj;
- const char *machine_password;
+ struct cli_credentials *machine_account;
/* Join domain as a member server. */
tj = torture_join_domain(TORTURE_NETBIOS_NAME,
ACB_WSTRUST,
- &machine_password);
+ &machine_account);
if (!tj) {
DEBUG(0, ("%s failed to join domain\n",
@@ -28,10 +28,10 @@ BOOL torture_rpc_join(void)
/* Join domain as a domain controller. */
tj = torture_join_domain(TORTURE_NETBIOS_NAME,
ACB_SVRTRUST,
- &machine_password);
+ &machine_account);
if (!tj) {
- DEBUG(0, ("%s failed to join domain %s.\n",
- TORTURE_NETBIOS_NAME, lp_workgroup()));
+ DEBUG(0, ("%s failed to join domain\n",
+ TORTURE_NETBIOS_NAME));
return False;
}