]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: libsmb: Convert find_master_ip() to call internal_resolve_name() not _internal_re...
authorJeremy Allison <jra@samba.org>
Wed, 9 Sep 2020 16:50:32 +0000 (09:50 -0700)
committerNoel Power <npower@samba.org>
Tue, 15 Sep 2020 10:09:39 +0000 (10:09 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
source3/libsmb/namequery.c

index 25f8c24f8f6e7e054d92ea70a3d0e9c849fe6eb6..1360f140b1e66791729f26203c350b4f66ef07e9 100644 (file)
@@ -3826,7 +3826,7 @@ done:
 
 bool find_master_ip(const char *group, struct sockaddr_storage *master_ss)
 {
-       struct ip_service *ip_list = NULL;
+       struct samba_sockaddr *sa_list = NULL;
        size_t count = 0;
        NTSTATUS status;
 
@@ -3835,35 +3835,35 @@ bool find_master_ip(const char *group, struct sockaddr_storage *master_ss)
                return false;
        }
 
-       status = _internal_resolve_name(talloc_tos(),
+       status = internal_resolve_name(talloc_tos(),
                                        group,
                                        0x1D,
                                        NULL,
-                                       &ip_list,
+                                       &sa_list,
                                        &count,
                                        lp_name_resolve_order());
        if (NT_STATUS_IS_OK(status)) {
-               *master_ss = ip_list[0].ss;
-               TALLOC_FREE(ip_list);
+               *master_ss = sa_list[0].u.ss;
+               TALLOC_FREE(sa_list);
                return true;
        }
 
-       TALLOC_FREE(ip_list);
+       TALLOC_FREE(sa_list);
 
-       status = _internal_resolve_name(talloc_tos(),
+       status = internal_resolve_name(talloc_tos(),
                                        group,
                                        0x1B,
                                        NULL,
-                                       &ip_list,
+                                       &sa_list,
                                        &count,
                                        lp_name_resolve_order());
        if (NT_STATUS_IS_OK(status)) {
-               *master_ss = ip_list[0].ss;
-               TALLOC_FREE(ip_list);
+               *master_ss = sa_list[0].u.ss;
+               TALLOC_FREE(sa_list);
                return true;
        }
 
-       TALLOC_FREE(ip_list);
+       TALLOC_FREE(sa_list);
        return false;
 }