From owner-svn-src-all@FreeBSD.ORG  Tue Jul  1 18:05:39 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 10396936;
 Tue,  1 Jul 2014 18:05:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F23D22D6A;
 Tue,  1 Jul 2014 18:05:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61I5c2e012737;
 Tue, 1 Jul 2014 18:05:38 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61I5civ012736;
 Tue, 1 Jul 2014 18:05:38 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201407011805.s61I5civ012736@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 1 Jul 2014 18:05:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r268107 - releng/9.3/lib/libc/net
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jul 2014 18:05:39 -0000

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);
 		}