From d9db2934c7cdff5111b7412ea36c531f73468449 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 24 Mar 2011 11:55:38 -0700 Subject: [PATCH] Fix is_myname_or_ipaddr() to be robust against strange DNS setups. If IPv6 DNS names are turned on, but Samba isn't configured to listen on an IPv6 interface, then is_myname_or_ipaddr() can return false on a valid DNS name that it should detect is our own. If the IPv6 addr is returned by preference, then looking at the first addr only causes is_myname_or_ipaddr() to fail. We need to look at all the addresses returned by the DNS lookup and check all of them against our interface list. This is an order N^2 lookup, but there shouldn't be enough addresses to make this a practical problem. Jeremy. --- source3/lib/util_sock.c | 88 ++++++++++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 31 deletions(-) diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 7a573ad..1441560 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -1839,13 +1839,46 @@ const char *get_mydnsfullname(void) } /************************************************************ + Is this my ip address ? +************************************************************/ + +static bool is_my_ipaddr(const char *ipaddr_str) +{ + struct sockaddr_storage ss; + struct iface_struct *nics; + int i, n; + + if (!interpret_string_addr(&ss, ipaddr_str, AI_NUMERICHOST)) { + return false; + } + + if (ismyaddr((struct sockaddr *)&ss)) { + return true; + } + + if (is_zero_addr((struct sockaddr *)&ss) || + is_loopback_addr((struct sockaddr *)&ss)) { + return false; + } + + n = get_interfaces(talloc_tos(), &nics); + for (i=0; iai_next) { + char addr[INET6_ADDRSTRLEN]; + struct sockaddr_storage ss; - n = get_interfaces(talloc_tos(), &nics); - for (i=0; iai_addr, p->ai_addrlen); + print_sockaddr(addr, + sizeof(addr), + &ss); + if (is_my_ipaddr(addr)) { + freeaddrinfo(res); return true; } } - TALLOC_FREE(nics); + freeaddrinfo(res); + } + + /* Maybe its an IP address? */ + if (is_ipaddress(servername)) { + return is_my_ipaddr(servername); } /* No match */ -- 1.7.3.1