sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-06 17:32:29 +03:00
Code Activity

addns: Remove support for dns_host_file.

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider
2014-11-20 11:31:29 +01:00
committed by Andrew Bartlett
parent 3ab2aa2511
commit 7f00fcf558
9 changed files with 176 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source3/libsmb/dsgetdcname.c
View File

@ -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)) {