Attachment 8565 Details for Bug 9656 – patches cherry-picked from master

[patch] patches cherry-picked from master

0001-Fallback-to-the-internal-resolver-on-EAI_FAIL.patch (text/plain), 1.71 KB, created by Andrew Bartlett on 2013-02-17 09:48:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2013-02-17 09:48:56 UTC

Size: 1.71 KB

patch

obsolete

>From 68c01c6c4798c2a4cfc22cee64318f4f55d2e5cc Mon Sep 17 00:00:00 2001
>From: Landon Fuller <landonf@bikemonkey.org>
>Date: Sat, 16 Feb 2013 22:57:40 -0500
>Subject: [PATCH] Fallback to the internal resolver on EAI_FAIL.
>
>On Linux, non-RFC 1034-complaint names (such as gc._msdsc.example.org)
>will result in the resolver returning the non-POSIX EAI_NODATA. In that
>case, the case statement here would fall back on the internal resolver,
>allowing resolution to complete successfully.
>
>On FreeBSD, the libc resolver uses the same validation code, but
>the POSIX result of EAI_FAIL is returned instead of EAI_NODATA. Since
>there was no case for this error code, no fallback to the internal
>resolver would occur. This led to replication failing on FreeBSD.
>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
>Autobuild-Date(master): Sun Feb 17 07:06:36 CET 2013 on sn-devel-104
>(cherry picked from commit 6dfb35f3ff7ad2d2089c0a3e5eab342384e45e4c)
>---
> source4/libcli/resolve/dns_ex.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
>index 7f5b841..4bc71fa 100644
>--- a/source4/libcli/resolve/dns_ex.c
>+++ b/source4/libcli/resolve/dns_ex.c
>@@ -399,8 +399,10 @@ static void run_child_getaddrinfo(struct dns_ex_state *state, int fd)
> #ifdef EAI_NODATA
> 		case EAI_NODATA:
> #endif
>+		case EAI_FAIL:
>+			/* Linux returns EAI_NODATA on non-RFC1034-compliant names. FreeBSD returns EAI_FAIL */
> 		case EAI_NONAME:
>-			/* getaddrinfo() doesn't handle CNAME records */
>+			/* getaddrinfo() doesn't handle CNAME or non-RFC1034 compatible records */
> 			run_child_dns_lookup(state, fd);
> 			return;
> 		default:
>-- 
>1.7.11.7
>

Flags:

obnox: review+
metze: review+

Actions: View

Attachments on bug 9656: 8545 | 8558 | 8563 | 8564 | 8565