[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  10537a89bb0 s4: libcli: Ignore errors when getting A records after fetching AAAA records.
      from  76adda9d2fe lib/replace: fix memory leak in snprintf replacements

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 10537a89bb0b461ba31d614b7c9ed56a842422e7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 8 10:13:18 2022 -0800

    s4: libcli: Ignore errors when getting A records after fetching AAAA records.
    
    The target may only be available over IPv6.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15226
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Nov  9 20:34:07 UTC 2022 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source4/libcli/resolve/dns_ex.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 0bb3ba02287..b8447bec4de 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -245,13 +245,15 @@ static struct dns_records_container get_a_aaaa_records(TALLOC_CTX *mem_ctx,
 		* Most of the server do it, let's ask for A specificaly.
 		*/
 		err = dns_lookup(tmp_ctx, name, QTYPE_A, &reply);
-		if (!ERR_DNS_IS_OK(err)) {
-			goto done;
-		}
-
-		total = reply_to_addrs(tmp_ctx, &a_num, &addrs, total,
+		if (ERR_DNS_IS_OK(err)) {
+			/*
+			 * Ignore an error here and just return any AAAA
+			 * records we already got. This may be an IPv6-only
+			 * config.
+			 */
+			total = reply_to_addrs(tmp_ctx, &a_num, &addrs, total,
 					reply, port);
-
+		}
 	}
 
 	if (total) {


-- 
Samba Shared Repository