From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Sep 2020 23:24:25 +0000 (-0700)
Subject: s3: libsmb: Rename get_kdc_list_sa() back to get_kdc_list().
X-Git-Tag: talloc-2.3.2~517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eecdd9401fc2adcc5b09fee8553db34344c7959;p=thirdparty%2Fsamba.git

s3: libsmb: Rename get_kdc_list_sa() back to get_kdc_list().

The samba_sockaddr interface is now the only one.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
---

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 9f305acc0ec..583067aac73 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -454,13 +454,13 @@ static char *get_kdc_ip_string(char *mem_ctx,
 	 */
 
 	if (sitename) {
-		status = get_kdc_list_sa(talloc_tos(),
+		status = get_kdc_list(talloc_tos(),
 					realm,
 					sitename,
 					&ip_sa_site,
 					&count_site);
 		if (!NT_STATUS_IS_OK(status)) {
-			DBG_ERR("get_kdc_list_sa fail %s\n",
+			DBG_ERR("get_kdc_list fail %s\n",
 				nt_errstr(status));
 			TALLOC_FREE(kdc_str);
 			goto out;
@@ -472,13 +472,13 @@ static char *get_kdc_ip_string(char *mem_ctx,
 
 	/* Get all KDC's. */
 
-	status = get_kdc_list_sa(talloc_tos(),
+	status = get_kdc_list(talloc_tos(),
 					realm,
 					NULL,
 					&ip_sa_nonsite,
 					&count_nonsite);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_ERR("get_kdc_list_sa (site-less) fail %s\n",
+		DBG_ERR("get_kdc_list (site-less) fail %s\n",
 			nt_errstr(status));
 		TALLOC_FREE(kdc_str);
 		goto out;
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index b590cb413aa..4f933c66694 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -4216,7 +4216,7 @@ NTSTATUS get_sorted_dc_list(TALLOC_CTX *ctx,
  Returns a samba_sockaddr array.
 *********************************************************************/
 
-NTSTATUS get_kdc_list_sa(TALLOC_CTX *ctx,
+NTSTATUS get_kdc_list(TALLOC_CTX *ctx,
 			const char *realm,
 			const char *sitename,
 			struct samba_sockaddr **sa_list_ret,
diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index 299a5ebc04f..879a2113747 100644
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -116,7 +116,7 @@ NTSTATUS get_sorted_dc_list(TALLOC_CTX *ctx,
 			struct ip_service **ip_list_ret,
 			size_t *ret_count,
 			bool ads_only);
-NTSTATUS get_kdc_list_sa(TALLOC_CTX *ctx,
+NTSTATUS get_kdc_list(TALLOC_CTX *ctx,
 			const char *realm,
 			const char *sitename,
 			struct samba_sockaddr **sa_list_ret,
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 970ac724709..1476e0aa95f 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -316,13 +316,13 @@ static int net_lookup_kdc(struct net_context *c, int argc, const char **argv)
 		realm = (const char *) *get_host_realms;
 	}
 
-	status = get_kdc_list_sa(talloc_tos(),
+	status = get_kdc_list(talloc_tos(),
 				realm,
 				NULL,
 				&kdcs,
 				&num_kdcs);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_WARNING("get_kdc_list_sa failed (%s)\n",
+		DBG_WARNING("get_kdc_list failed (%s)\n",
 			nt_errstr(status));
 		krb5_free_host_realm(ctx, get_host_realms);
 		krb5_free_context(ctx);