addns: Remove support for dns_host_file.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

5 files changed, 64 insertions, 45 deletions

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index c774b44541..93d5c791bf 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -539,7 +539,6 @@ ADS_STATUS ads_connect_gc(ADS_STRUCT *ads)
 	int i;
 	bool done = false;
 	char *sitename = NULL;
-	const char *dns_hosts_file;
 
 	if (!realm)
 		realm = lp_realm();
@@ -549,7 +548,6 @@ ADS_STATUS ads_connect_gc(ADS_STRUCT *ads)
 		sitename = sitename_fetch(frame, realm);
 	}
 
-	dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL);
 	do {
 		/* We try once with a sitename and once without
 		   (unless we don't have a sitename and then we're
@@ -558,9 +556,11 @@ ADS_STATUS ads_connect_gc(ADS_STRUCT *ads)
 		if (sitename == NULL)
 			done = true;
 
-		nt_status = ads_dns_query_gcs(frame, dns_hosts_file,
-					      realm, sitename,
-					      &gcs_list, &num_gcs);
+		nt_status = ads_dns_query_gcs(frame,
+					      realm,
+					      sitename,
+					      &gcs_list,
+					      &num_gcs);
 
 		if (!NT_STATUS_IS_OK(nt_status)) {
 			ads_status = ADS_ERROR_NT(nt_status);
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 0d1570a985..ac3bfd6c11 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -547,39 +547,49 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
 	int numaddrs = 0;
 	struct ip_service_name *dclist = NULL;
 	int count = 0;
-	const char *dns_hosts_file;
 	char *guid_string;
 
-	dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL);
 	if (flags & DS_PDC_REQUIRED) {
-		status = ads_dns_query_pdc(mem_ctx, dns_hosts_file,
-					   domain_name, &dcs, &numdcs);
+		status = ads_dns_query_pdc(mem_ctx,
+					   domain_name,
+					   &dcs,
+					   &numdcs);
 	} else if (flags & DS_GC_SERVER_REQUIRED) {
-		status = ads_dns_query_gcs(mem_ctx, dns_hosts_file,
-					   domain_name, site_name,
-					   &dcs, &numdcs);
+		status = ads_dns_query_gcs(mem_ctx,
+					   domain_name,
+					   site_name,
+					   &dcs,
+					   &numdcs);
 	} else if (flags & DS_KDC_REQUIRED) {
-		status = ads_dns_query_kdcs(mem_ctx, dns_hosts_file,
-					    domain_name, site_name,
-					    &dcs, &numdcs);
+		status = ads_dns_query_kdcs(mem_ctx,
+					    domain_name,
+					    site_name,
+					    &dcs,
+					    &numdcs);
 	} else if (flags & DS_DIRECTORY_SERVICE_REQUIRED) {
-		status = ads_dns_query_dcs(mem_ctx, dns_hosts_file,
-					   domain_name, site_name,
-					   &dcs, &numdcs);
+		status = ads_dns_query_dcs(mem_ctx,
+					   domain_name,
+					   site_name,
+					   &dcs,
+					   &numdcs);
 	} else if (domain_guid) {
 		guid_string = GUID_string(mem_ctx, domain_guid);
 		if (!guid_string) {
 			return NT_STATUS_NO_MEMORY;
 		}
 
-		status = ads_dns_query_dcs_guid(mem_ctx, dns_hosts_file,
-						domain_name, guid_string,
-						&dcs, &numdcs);
+		status = ads_dns_query_dcs_guid(mem_ctx,
+						domain_name,
+						guid_string,
+						&dcs,
+						&numdcs);
 		TALLOC_FREE(guid_string);
 	} else {
-		status = ads_dns_query_dcs(mem_ctx, dns_hosts_file,
-					   domain_name, site_name,
-					   &dcs, &numdcs);
+		status = ads_dns_query_dcs(mem_ctx,
+					   domain_name,
+					   site_name,
+					   &dcs,
+					   &numdcs);
 	}
 
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 654ca1d349..3ee79b68a3 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -2424,7 +2424,6 @@ 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,28 +2436,32 @@ 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, dns_hosts_file,
-						   name, &dcs, &numdcs);
+			status = ads_dns_query_pdc(ctx,
+						   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, dns_hosts_file,
-						   name, sitename, &dcs,
+			status = ads_dns_query_dcs(ctx,
+						   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, dns_hosts_file,
-						    name, sitename, &dcs,
+			status = ads_dns_query_kdcs(ctx,
+						    name,
+						    sitename,
+						    &dcs,
 						    &numdcs);
 			break;
 		default:
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 7f3d74d782..ba500b50b6 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1143,7 +1143,6 @@ static NTSTATUS net_update_dns_internal(struct net_context *c,
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	DNS_ERROR dns_err;
 	fstring dns_server;
-	const char *dns_hosts_file;
 	const char *dnsdomain = NULL;
 	char *root_domain = NULL;
 
@@ -1155,9 +1154,10 @@ static NTSTATUS net_update_dns_internal(struct net_context *c,
 	}
 	dnsdomain++;
 
-	dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL);
-	status = ads_dns_lookup_ns(ctx, dns_hosts_file,
-				   dnsdomain, &nameservers, &ns_count);
+	status = ads_dns_lookup_ns(ctx,
+				   dnsdomain,
+				   &nameservers,
+				   &ns_count);
 	if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
 		/* Child domains often do not have NS records.  Look
 		   for the NS record for the forest root domain
@@ -1195,8 +1195,10 @@ static NTSTATUS net_update_dns_internal(struct net_context *c,
 
 		/* try again for NS servers */
 
-		status = ads_dns_lookup_ns(ctx, dns_hosts_file, root_domain,
-					   &nameservers, &ns_count);
+		status = ads_dns_lookup_ns(ctx,
+					   root_domain,
+					   &nameservers,
+					   &ns_count);
 
 		if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
 			DEBUG(3,("net_update_dns_internal: Failed to find name server for the %s "
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 9d61be2aa3..0c019e6e4d 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -106,7 +106,6 @@ static int net_lookup_ldap(struct net_context *c, int argc, const char **argv)
 	NTSTATUS status;
 	int ret;
 	char h_name[MAX_DNS_NAME_LENGTH];
-	const char *dns_hosts_file;
 
 	if (argc > 0)
 		domain = argv[0];
@@ -123,9 +122,11 @@ static int net_lookup_ldap(struct net_context *c, int argc, const char **argv)
 
 	DEBUG(9, ("Lookup up ldap for domain %s\n", domain));
 
-	dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL);
-	status = ads_dns_query_dcs(ctx, dns_hosts_file, domain, sitename,
-				   &dcs, &numdcs);
+	status = ads_dns_query_dcs(ctx,
+				   domain,
+				   sitename,
+				   &dcs,
+				   &numdcs);
 	if ( NT_STATUS_IS_OK(status) && numdcs ) {
 		print_ldap_srvlist(dcs, numdcs);
 		TALLOC_FREE( ctx );
@@ -159,8 +160,11 @@ static int net_lookup_ldap(struct net_context *c, int argc, const char **argv)
 
 	DEBUG(9, ("Looking up ldap for domain %s\n", domain));
 
-	status = ads_dns_query_dcs(ctx, dns_hosts_file, domain, sitename,
-				   &dcs, &numdcs);
+	status = ads_dns_query_dcs(ctx,
+				   domain,
+				   sitename,
+				   &dcs,
+				   &numdcs);
 	if ( NT_STATUS_IS_OK(status) && numdcs ) {
 		print_ldap_srvlist(dcs, numdcs);
 		TALLOC_FREE( ctx );