From a7e94fce3f86b99c328669d45dd685fc70026378 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 4 May 2012 17:27:36 -0400 Subject: s3-ads-dns: Break dependency on lp_parm In preparation of making this code common to s3 and s4 --- source3/libsmb/namequery.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source3/libsmb/namequery.c') diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 8934d852437..417464c17ef 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -2424,6 +2424,7 @@ static NTSTATUS resolve_ads(const char *name, struct dns_rr_srv *dcs = NULL; int numdcs = 0; int numaddrs = 0; + const char *dns_hosts_file; if ((name_type != 0x1c) && (name_type != KDC_NAME_TYPE) && (name_type != 0x1b)) { @@ -2437,23 +2438,27 @@ static NTSTATUS resolve_ads(const char *name, /* The DNS code needs fixing to find IPv6 addresses... JRA. */ + dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL); switch (name_type) { case 0x1b: DEBUG(5,("resolve_ads: Attempting to resolve " "PDC for %s using DNS\n", name)); - status = ads_dns_query_pdc(ctx, name, &dcs, &numdcs); + status = ads_dns_query_pdc(ctx, dns_hosts_file, + name, &dcs, &numdcs); break; case 0x1c: DEBUG(5,("resolve_ads: Attempting to resolve " "DCs for %s using DNS\n", name)); - status = ads_dns_query_dcs(ctx, name, sitename, &dcs, + status = ads_dns_query_dcs(ctx, dns_hosts_file, + name, sitename, &dcs, &numdcs); break; case KDC_NAME_TYPE: DEBUG(5,("resolve_ads: Attempting to resolve " "KDCs for %s using DNS\n", name)); - status = ads_dns_query_kdcs(ctx, name, sitename, &dcs, + status = ads_dns_query_kdcs(ctx, dns_hosts_file, + name, sitename, &dcs, &numdcs); break; default: -- cgit v1.2.1