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 9f305acc0ec6f07713cd77f4e35193c1af5b9f64..583067aac7375fb78eebc82646aa921beb852808 100644 (file)
--- 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 b590cb413aaec7098037fda9baa6cc2e5c8d7ab6..4f933c66694136594af0a7f07b6c988d6d174dfc 100644 (file)
--- 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 299a5ebc04f2a6686a3329f228801f1875089f3e..879a21137475afc6628ff535700f7b74f2c2c4d3 100644 (file)
--- 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 970ac7247099e9cf2b54d7a7db0553cde7275fb4..1476e0aa95f8b26d740eb83add25bf259c00b2ba 100644 (file)
--- 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);