s3: libsmb: Rename get_sorted_dc_list_talloc() -> get_sorted_dc_list()

There are no non-talloc callers.

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

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 626ae75d8df2230e10815c0880340723b60b9e51..8fbe34a20b7d4902278c76da2a9dca6167430c0a 100755 (executable)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -391,7 +391,7 @@ static NTSTATUS resolve_and_ping_netbios(ADS_STRUCT *ads,
        DEBUG(6, ("resolve_and_ping_netbios: (cldap) looking for domain '%s'\n",
                  domain));
 
-       status = get_sorted_dc_list_talloc(talloc_tos(),
+       status = get_sorted_dc_list(talloc_tos(),
                                domain,
                                NULL,
                                &ip_list,
@@ -442,7 +442,7 @@ static NTSTATUS resolve_and_ping_dns(ADS_STRUCT *ads, const char *sitename,
        DEBUG(6, ("resolve_and_ping_dns: (cldap) looking for realm '%s'\n",
                  realm));
 
-       status = get_sorted_dc_list_talloc(talloc_tos(),
+       status = get_sorted_dc_list(talloc_tos(),
                                realm,
                                sitename,
                                &ip_list,

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 0f8e75331bad59170db77c0e3cfb4395fc5f47a3..02b3546ff3cf900a9bf4881943ed0d0cb4e75dad 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3967,7 +3967,7 @@ static NTSTATUS get_dc_list(const char *domain,
  Small wrapper function to get the DC list and sort it if neccessary.
 *********************************************************************/
 
-NTSTATUS get_sorted_dc_list_talloc(TALLOC_CTX *ctx,
+NTSTATUS get_sorted_dc_list(TALLOC_CTX *ctx,
                                const char *domain,
                                const char *sitename,
                                struct ip_service **ip_list_ret,

diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index 1eb3f86f3c3e28552eae480f1ef198d24096b84a..d38e0efe3c160bb1fffa6897fecd68b809521bd4 100644 (file)
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -109,7 +109,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
                unsigned int *p_num_entries);
 bool find_master_ip(const char *group, struct sockaddr_storage *master_ss);
 bool get_pdc_ip(const char *domain, struct sockaddr_storage *pss);
-NTSTATUS get_sorted_dc_list_talloc(TALLOC_CTX *ctx,
+NTSTATUS get_sorted_dc_list(TALLOC_CTX *ctx,
                        const char *domain,
                        const char *sitename,
                        struct ip_service **ip_list_ret,

diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index c8a16823673eb173df62318b4167ceb7bfbb7dcf..212c9c03bd2a6c239d9911f3989a8f7a9f7c8dea 100644 (file)
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/libsmb/namequery_dc.c
@@ -173,7 +173,7 @@ static bool rpc_dc_name(const char *domain,
 
        /* get a list of all domain controllers */
 
-       result = get_sorted_dc_list_talloc(talloc_tos(),
+       result = get_sorted_dc_list(talloc_tos(),
                                domain,
                                NULL,
                                &ip_list,

diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 5ec15b94b2c6216548768563139fdadcba878f61..c1dabcd4cac47848d6b9793c8df933300658880e 100644 (file)
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -214,7 +214,7 @@ static int net_lookup_dc(struct net_context *c, int argc, const char **argv)
        d_printf("%s\n", pdc_str);
 
        sitename = sitename_fetch(talloc_tos(), domain);
-       status = get_sorted_dc_list_talloc(talloc_tos(),
+       status = get_sorted_dc_list(talloc_tos(),
                                domain,
                                sitename,
                                &ip_list,

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 00b0bd8a336f614ae84a6f5c1a122a47eb7517c8..06ccdc5146355f121e0e28eb1144fc521ac5b11d 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1574,7 +1574,7 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
                if (sitename) {
 
                        /* Do the site-specific AD dns lookup first. */
-                       (void)get_sorted_dc_list_talloc(mem_ctx,
+                       (void)get_sorted_dc_list(mem_ctx,
                                        domain->alt_name,
                                        sitename,
                                        &ip_list,
@@ -1603,7 +1603,7 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
                }
 
                /* Now we add DCs from the main AD DNS lookup. */
-               (void)get_sorted_dc_list_talloc(mem_ctx,
+               (void)get_sorted_dc_list(mem_ctx,
                                domain->alt_name,
                                NULL,
                                &ip_list,
@@ -1629,7 +1629,7 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
        /* Try standard netbios queries if no ADS and fall back to DNS queries
         * if alt_name is available */
        if (*num_dcs == 0) {
-               (void)get_sorted_dc_list_talloc(mem_ctx,
+               (void)get_sorted_dc_list(mem_ctx,
                                        domain->name,
                                        NULL,
                                        &ip_list,
@@ -1637,7 +1637,7 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
                                        false);
                if (iplist_size == 0) {
                        if (domain->alt_name != NULL) {
-                               (void)get_sorted_dc_list_talloc(mem_ctx,
+                               (void)get_sorted_dc_list(mem_ctx,
                                                domain->alt_name,
                                                NULL,
                                                &ip_list,