From: Jeremy Allison <jra@samba.org>
Date: Wed, 26 Aug 2020 18:43:32 +0000 (-0700)
Subject: s3: libads: Rename get_kdc_list_talloc() -> get_kdc_list().
X-Git-Tag: talloc-2.3.2~622
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6deb23c6187da770b03ebe313138506fb6cde0e7;p=thirdparty%2Fsamba.git

s3: libads: Rename get_kdc_list_talloc() -> get_kdc_list().

It's the only version now.

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

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index f8f47649dde..d02d4d881e7 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_talloc(talloc_tos(),
+		status = get_kdc_list(talloc_tos(),
 					realm,
 					sitename,
 					&ip_srv_site,
 					&count_site);
 		if (!NT_STATUS_IS_OK(status)) {
-			DBG_ERR("get_kdc_list_talloc 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_talloc(talloc_tos(),
+	status = get_kdc_list(talloc_tos(),
 					realm,
 					NULL,
 					&ip_srv_nonsite,
 					&count_nonsite);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_ERR("get_kdc_list_talloc (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 23f816401c5..dcc1b026b50 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -4018,7 +4018,7 @@ NTSTATUS get_sorted_dc_list( const char *domain,
  Get the KDC list - re-use all the logic in get_dc_list.
 *********************************************************************/
 
-NTSTATUS get_kdc_list_talloc(TALLOC_CTX *ctx,
+NTSTATUS get_kdc_list(TALLOC_CTX *ctx,
 			const char *realm,
 			const char *sitename,
 			struct ip_service **ip_list_ret,
diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index 38c92cebccb..b726f252957 100644
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -114,7 +114,7 @@ NTSTATUS get_sorted_dc_list( const char *domain,
 			struct ip_service **ip_list,
 			int *count,
 			bool ads_only );
-NTSTATUS get_kdc_list_talloc(TALLOC_CTX *ctx,
+NTSTATUS get_kdc_list(TALLOC_CTX *ctx,
 			const char *realm,
 			const char *sitename,
 			struct ip_service **ip_list_ret,
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 706f41f689b..594a87d8816 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -309,13 +309,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_talloc(talloc_tos(),
+	status = get_kdc_list(talloc_tos(),
 				realm,
 				NULL,
 				&kdcs,
 				&num_kdcs);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_WARNING("get_kdc_list_talloc 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);