From: Jeremy Allison <jra@samba.org>
Date: Wed, 26 Aug 2020 20:53:35 +0000 (-0700)
Subject: s3: libsmb: Remove internal_resolve_name() externally. All callers now use internal_r... 
X-Git-Tag: talloc-2.3.2~600
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68d329b4079dadef0dd2ca27c3a5bb697a040db;p=thirdparty%2Fsamba.git

s3: libsmb: Remove internal_resolve_name() externally. All callers now use internal_resolve_name_talloc().

Make the wrapped internal_resolve_name() function static as _internal_resolve_name().

Now we can rename the callers back from internal_resolve_name_talloc() -> internal_resolve_name()
as all external callers are talloc-based.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
---

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index d5731950a0c..54b9605b3df 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3177,7 +3177,7 @@ static const char **filter_out_nbt_lookup(TALLOC_CTX *mem_ctx,
  resolve_hosts() when looking up DC's via SRV RR entries in DNS
 **********************************************************************/
 
-NTSTATUS internal_resolve_name(const char *name,
+static NTSTATUS _internal_resolve_name(const char *name,
 			        int name_type,
 				const char *sitename,
 				struct ip_service **return_iplist,
@@ -3416,7 +3416,7 @@ NTSTATUS internal_resolve_name(const char *name,
 }
 
 /********************************************************
- Wrapper function for internal_resolve_name() that returns
+ Wrapper function for _internal_resolve_name() that returns
  talloc'ed memory. Eventually this will be the only version
  and then we can rename it to internal_resolve_name().
 ********************************************************/
@@ -3434,7 +3434,7 @@ NTSTATUS internal_resolve_name_talloc(TALLOC_CTX *ctx,
 	int count = 0;
 	NTSTATUS status;
 
-	status = internal_resolve_name(name,
+	status = _internal_resolve_name(name,
 					name_type,
 					sitename,
 					&iplist_malloc,
diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index 1579942c36b..201904d289e 100644
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -92,12 +92,6 @@ NTSTATUS dns_lookup_list_async(TALLOC_CTX *ctx,
 			       size_t *p_num_addrs,
 			       struct samba_sockaddr **pp_addrs,
 			       char ***pp_dns_names);
-NTSTATUS internal_resolve_name(const char *name,
-			        int name_type,
-				const char *sitename,
-				struct ip_service **return_iplist,
-				int *return_count,
-				const char **resolve_order);
 NTSTATUS internal_resolve_name_talloc(TALLOC_CTX *ctx,
 				const char *name,
 				int name_type,