From owner-p4-projects@FreeBSD.ORG  Wed Aug 16 19:53:07 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F7BD16A4DE; Wed, 16 Aug 2006 19:53:07 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EE35B16A4E2
	for <perforce@freebsd.org>; Wed, 16 Aug 2006 19:53:06 +0000 (UTC)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0F30F43D6B
	for <perforce@freebsd.org>; Wed, 16 Aug 2006 19:52:53 +0000 (GMT)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJqqxC016263
	for <perforce@freebsd.org>; Wed, 16 Aug 2006 19:52:52 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJqq6g016260
	for perforce@freebsd.org; Wed, 16 Aug 2006 19:52:52 GMT
	(envelope-from bushman@freebsd.org)
Date: Wed, 16 Aug 2006 19:52:52 GMT
Message-Id: <200608161952.k7GJqq6g016260@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bushman@freebsd.org using -f
From: Michael Bushkov <bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 104284 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Aug 2006 19:53:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=104284

Change 104284 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:52:26

	Bug fix - couldn't be built with INET6 turned off.

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/name6.c#4 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/name6.c#4 (text+ko) ====

@@ -195,8 +195,8 @@
 
 static struct	 hostent *_hpcopy(struct hostent *, int *);
 static struct	 hostent *_hpaddr(int, const char *, void *, int *);
+#ifdef INET6
 static struct	 hostent *_hpmerge(struct hostent *, struct hostent *, int *);
-#ifdef INET6
 static struct	 hostent *_hpmapv6(struct hostent *, int *);
 #endif
 static struct	 hostent *_hpsort(struct hostent *, res_state);
@@ -522,6 +522,7 @@
 	return (_hpcopy(hp, errp));
 }
 
+#ifdef INET6
 /*
  * _hpmerge: merge 2 hostent structure, arguments will be freed
  */
@@ -558,17 +559,14 @@
 		}
 	}
 	aliases[nalias] = NULL;
-#ifdef INET6
 	if (hp1->h_length != hp2->h_length) {
 		hp->h_addrtype = AF_INET6;
 		hp->h_length = sizeof(struct in6_addr);
 	} else {
-#endif
 		hp->h_addrtype = hp1->h_addrtype;
 		hp->h_length = hp1->h_length;
-#ifdef INET6
 	}
-#endif
+
 	hp->h_addr_list = addrs;
 	naddr = 0;
 	for (i = 1; i <= 2; i++) {
@@ -589,6 +587,7 @@
 	addrs[naddr] = NULL;
 	return (_hpcopy(hp, errp));
 }
+#endif
 
 /*
  * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses