X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Flibsmb%2Fdsgetdcname.c;h=ac3bfd6c112e6692d340c3e4997a87fd435b5cec;hb=7f00fcf5589fc0e27ddd1f78fbe9c223b26cd919;hp=0d1570a98547cd17b2c145d1d1df0de17e5424d2;hpb=a47f5845dd27de8ef198798b66878fbc48c5bef6;p=obnox%2Fsamba%2Fsamba-obnox.git diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index 0d1570a9854..ac3bfd6c112 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)) {