From ef8740ce89661281c8066583441c16261cd5eaae Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 29 Nov 2020 19:17:30 +0100 Subject: [PATCH] net: Use ads_dns_query_srv() in net_lookup_ldap() Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/utils/net_lookup.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c index c171c27be96..80b6a9ea779 100644 --- a/source3/utils/net_lookup.c +++ b/source3/utils/net_lookup.c @@ -20,7 +20,7 @@ #include "utils/net.h" #include "libsmb/namequery.h" #include "libads/sitename_cache.h" -#include "../lib/addns/dnsquery.h" +#include "lib/addns/dnsquery_srv.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "smb_krb5.h" #include "../libcli/security/security.h" @@ -108,6 +108,7 @@ 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]; + char *query = NULL; if (argc > 0) domain = argv[0]; @@ -127,14 +128,17 @@ static int net_lookup_ldap(struct net_context *c, int argc, const char **argv) if (sitename == NULL) { sitename = sitename_fetch(ctx, domain); } + query = ads_dns_query_string_dcs(ctx, domain); DEBUG(9, ("Lookup up ldap for domain %s\n", domain)); - status = ads_dns_query_dcs(ctx, - domain, - sitename, - &dcs, - &numdcs); + status = ads_dns_query_srv( + ctx, + lp_get_async_dns_timeout(), + sitename, + query, + &dcs, + &numdcs); if ( NT_STATUS_IS_OK(status) && numdcs ) { print_ldap_srvlist(dcs, numdcs); TALLOC_FREE( ctx ); @@ -168,11 +172,13 @@ 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, - domain, - sitename, - &dcs, - &numdcs); + status = ads_dns_query_srv( + ctx, + lp_get_async_dns_timeout(), + sitename, + query, + &dcs, + &numdcs); if ( NT_STATUS_IS_OK(status) && numdcs ) { print_ldap_srvlist(dcs, numdcs); TALLOC_FREE( ctx ); -- 2.47.3