summaryrefslogtreecommitdiffstats
path: root/source4/torture/libnet
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-08-28 00:16:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:02:58 -0500
commit2fefa818a95138fc7d6508093f426cb4ed92138f (patch)
treedff4b61a40639066ed8732555fb72c5218cd4e18 /source4/torture/libnet
parentf8c373fd6a93be2327db024f7e149d91a7089590 (diff)
downloadsamba-2fefa818a95138fc7d6508093f426cb4ed92138f.tar.gz
samba-2fefa818a95138fc7d6508093f426cb4ed92138f.tar.xz
samba-2fefa818a95138fc7d6508093f426cb4ed92138f.zip
r24728: Use more stock torture functions.
(This used to be commit da3a7ee407a2b41bd01f45072cad12bf29250b33)
Diffstat (limited to 'source4/torture/libnet')
-rw-r--r--source4/torture/libnet/libnet_BecomeDC.c4
-rw-r--r--source4/torture/libnet/libnet_domain.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index ab50f91c1d7..9d67e093b10 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -763,7 +763,7 @@ BOOL torture_net_become_dc(struct torture_context *torture)
b.in.domain_dns_name = torture_join_dom_dns_name(s->tj);
b.in.domain_netbios_name = torture_join_dom_netbios_name(s->tj);
b.in.domain_sid = torture_join_sid(s->tj);
- b.in.source_dsa_address = lp_parm_string(-1, "torture", "host");
+ b.in.source_dsa_address = torture_setting_string(torture, "host", NULL);
b.in.dest_dsa_netbios_name = s->netbios_name;
b.in.callbacks.private_data = s;
@@ -843,7 +843,7 @@ cleanup:
ZERO_STRUCT(u);
u.in.domain_dns_name = torture_join_dom_dns_name(s->tj);
u.in.domain_netbios_name = torture_join_dom_netbios_name(s->tj);
- u.in.source_dsa_address = lp_parm_string(-1, "torture", "host");
+ u.in.source_dsa_address = torture_setting_string(torture, "host", NULL);
u.in.dest_dsa_netbios_name = s->netbios_name;
status = libnet_UnbecomeDC(s->ctx, s, &u);
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 2ececa690a6..915054bf508 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -120,8 +120,7 @@ static BOOL test_opendomain_lsa(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
return True;
}
-
-BOOL torture_domain_open_lsa(struct torture_context *torture)
+bool torture_domain_open_lsa(struct torture_context *torture)
{
NTSTATUS status;
BOOL ret = True;