svn commit: r268107 - releng/9.3/lib/libc/net

[Hajimu UMEMOTO]

Author: ume
Date: Tue Jul  1 18:05:38 2014
New Revision: 268107
URL: http://svnweb.freebsd.org/changeset/base/268107

Log:
  MFS r268053 (MFC r267800):
  Exclude IPv4 address from doing longest match.
  It prevented DNS based load balancing.
  
  Approved by:	re (delphij)

Modified:
  releng/9.3/lib/libc/net/getaddrinfo.c
Directory Properties:
  releng/9.3/lib/libc/   (props changed)

Modified: releng/9.3/lib/libc/net/getaddrinfo.c
==============================================================================
--- releng/9.3/lib/libc/net/getaddrinfo.c	Tue Jul  1 17:31:47 2014	(r268106)
+++ releng/9.3/lib/libc/net/getaddrinfo.c	Tue Jul  1 18:05:38 2014	(r268107)
@@ -1007,7 +1007,8 @@ comp_dst(const void *arg1, const void *a
 	 * We compare the match length in a same AF only.
 	 */
 	if (dst1->aio_ai->ai_addr->sa_family ==
-	    dst2->aio_ai->ai_addr->sa_family) {
+	    dst2->aio_ai->ai_addr->sa_family &&
+	    dst1->aio_ai->ai_addr->sa_family != AF_INET) {
 		if (dst1->aio_matchlen > dst2->aio_matchlen) {
 			return(-1);
 		}