From 2fefa818a95138fc7d6508093f426cb4ed92138f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 28 Aug 2007 00:16:58 +0000 Subject: r24728: Use more stock torture functions. (This used to be commit da3a7ee407a2b41bd01f45072cad12bf29250b33) --- source4/torture/libnet/libnet_BecomeDC.c | 4 ++-- source4/torture/libnet/libnet_domain.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source4/torture/libnet') diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index ab50f91c1d..9d67e093b1 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 2ececa690a..915054bf50 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; -- cgit