diff options
| author | Andreas Schneider <asn@samba.org> | 2014-11-20 11:31:29 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-12-18 06:47:40 +0100 |
| commit | 7f00fcf5589fc0e27ddd1f78fbe9c223b26cd919 (patch) | |
| tree | c2305dc60973c1812b5b39eeff600add5f212bcf /source3/utils | |
| parent | 3ab2aa2511769ec2b32b1e80093b28a532693ae6 (diff) | |
| download | samba-7f00fcf5589fc0e27ddd1f78fbe9c223b26cd919.tar.gz samba-7f00fcf5589fc0e27ddd1f78fbe9c223b26cd919.tar.xz samba-7f00fcf5589fc0e27ddd1f78fbe9c223b26cd919.zip | |
addns: Remove support for dns_host_file.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_ads.c | 14 | ||||
| -rw-r--r-- | source3/utils/net_lookup.c | 16 |
2 files changed, 18 insertions, 12 deletions
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 ); |