mirror of
https://github.com/samba-team/samba.git
synced 2025-08-02 00:22:11 +03:00
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>
This commit is contained in:
committed by
Noel Power
parent
a0984e5064
commit
23fb64f35a
@ -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",
|
DEBUG(6, ("resolve_and_ping_netbios: (cldap) looking for domain '%s'\n",
|
||||||
domain));
|
domain));
|
||||||
|
|
||||||
status = get_sorted_dc_list_talloc(talloc_tos(),
|
status = get_sorted_dc_list(talloc_tos(),
|
||||||
domain,
|
domain,
|
||||||
NULL,
|
NULL,
|
||||||
&ip_list,
|
&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",
|
DEBUG(6, ("resolve_and_ping_dns: (cldap) looking for realm '%s'\n",
|
||||||
realm));
|
realm));
|
||||||
|
|
||||||
status = get_sorted_dc_list_talloc(talloc_tos(),
|
status = get_sorted_dc_list(talloc_tos(),
|
||||||
realm,
|
realm,
|
||||||
sitename,
|
sitename,
|
||||||
&ip_list,
|
&ip_list,
|
||||||
|
@ -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.
|
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 *domain,
|
||||||
const char *sitename,
|
const char *sitename,
|
||||||
struct ip_service **ip_list_ret,
|
struct ip_service **ip_list_ret,
|
||||||
|
@ -109,7 +109,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
|
|||||||
unsigned int *p_num_entries);
|
unsigned int *p_num_entries);
|
||||||
bool find_master_ip(const char *group, struct sockaddr_storage *master_ss);
|
bool find_master_ip(const char *group, struct sockaddr_storage *master_ss);
|
||||||
bool get_pdc_ip(const char *domain, struct sockaddr_storage *pss);
|
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 *domain,
|
||||||
const char *sitename,
|
const char *sitename,
|
||||||
struct ip_service **ip_list_ret,
|
struct ip_service **ip_list_ret,
|
||||||
|
@ -173,7 +173,7 @@ static bool rpc_dc_name(const char *domain,
|
|||||||
|
|
||||||
/* get a list of all domain controllers */
|
/* get a list of all domain controllers */
|
||||||
|
|
||||||
result = get_sorted_dc_list_talloc(talloc_tos(),
|
result = get_sorted_dc_list(talloc_tos(),
|
||||||
domain,
|
domain,
|
||||||
NULL,
|
NULL,
|
||||||
&ip_list,
|
&ip_list,
|
||||||
|
@ -214,7 +214,7 @@ static int net_lookup_dc(struct net_context *c, int argc, const char **argv)
|
|||||||
d_printf("%s\n", pdc_str);
|
d_printf("%s\n", pdc_str);
|
||||||
|
|
||||||
sitename = sitename_fetch(talloc_tos(), domain);
|
sitename = sitename_fetch(talloc_tos(), domain);
|
||||||
status = get_sorted_dc_list_talloc(talloc_tos(),
|
status = get_sorted_dc_list(talloc_tos(),
|
||||||
domain,
|
domain,
|
||||||
sitename,
|
sitename,
|
||||||
&ip_list,
|
&ip_list,
|
||||||
|
@ -1574,7 +1574,7 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
|
|||||||
if (sitename) {
|
if (sitename) {
|
||||||
|
|
||||||
/* Do the site-specific AD dns lookup first. */
|
/* 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,
|
domain->alt_name,
|
||||||
sitename,
|
sitename,
|
||||||
&ip_list,
|
&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. */
|
/* 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,
|
domain->alt_name,
|
||||||
NULL,
|
NULL,
|
||||||
&ip_list,
|
&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
|
/* Try standard netbios queries if no ADS and fall back to DNS queries
|
||||||
* if alt_name is available */
|
* if alt_name is available */
|
||||||
if (*num_dcs == 0) {
|
if (*num_dcs == 0) {
|
||||||
(void)get_sorted_dc_list_talloc(mem_ctx,
|
(void)get_sorted_dc_list(mem_ctx,
|
||||||
domain->name,
|
domain->name,
|
||||||
NULL,
|
NULL,
|
||||||
&ip_list,
|
&ip_list,
|
||||||
@ -1637,7 +1637,7 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
|
|||||||
false);
|
false);
|
||||||
if (iplist_size == 0) {
|
if (iplist_size == 0) {
|
||||||
if (domain->alt_name != NULL) {
|
if (domain->alt_name != NULL) {
|
||||||
(void)get_sorted_dc_list_talloc(mem_ctx,
|
(void)get_sorted_dc_list(mem_ctx,
|
||||||
domain->alt_name,
|
domain->alt_name,
|
||||||
NULL,
|
NULL,
|
||||||
&ip_list,
|
&ip_list,
|
||||||
|
Reference in New Issue
Block a user