From owner-p4-projects@FreeBSD.ORG  Mon Aug 21 01:57:46 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 7231416A4E6; Mon, 21 Aug 2006 01:57:46 +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 5102F16A4E2
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 01:57:46 +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 1746843D46
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 01:57:46 +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 k7L1vjqF004426
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 01:57:45 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7L1vjkq004423
	for perforce@freebsd.org; Mon, 21 Aug 2006 01:57:45 GMT
	(envelope-from bushman@freebsd.org)
Date: Mon, 21 Aug 2006 01:57:45 GMT
Message-Id: <200608210157.k7L1vjkq004423@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 104646 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: Mon, 21 Aug 2006 01:57:46 -0000

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

Change 104646 by bushman@bushman_nss_ldap_cached_make on 2006/08/21 01:57:08

	IFC

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getaddrinfo.c#2 integrate

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getaddrinfo.c#2 (text+ko) ====

@@ -236,32 +236,12 @@
 	struct policyhead *);
 static int matchlen(struct sockaddr *, struct sockaddr *);
 
-/*static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-	const struct addrinfo *, res_state);
-#if defined(RESOLVSORT)
-static int addr4sort(struct addrinfo *, res_state);
-#endif
-static int _dns_getaddrinfo(void *, void *, va_list);
-static void _sethtent(FILE **);
-static void _endhtent(FILE **);
-static struct addrinfo *_gethtent(FILE **, const char *,
-	const struct addrinfo *);
-static int _files_getaddrinfo(void *, void *, va_list);
-#ifdef YP
-static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static int _yp_getaddrinfo(void *, void *, va_list);
-#endif*/
 #ifdef NS_CACHING
 static int addrinfo_id_func(char *, size_t *, va_list, void *);
 static int addrinfo_marshal_func(char *, size_t *, void *, va_list, void *);
 static int addrinfo_unmarshal_func(char *, size_t, void *, va_list, void *);
 #endif
 
-/*static int res_queryN(const char *, struct res_target *, res_state);
-static int res_searchN(const char *, struct res_target *, res_state);
-static int res_querydomainN(const char *, const char *,
-	struct res_target *, res_state);*/
-
 /* XXX macros that make external reference is BAD. */
 
 #define GET_AI(ai, afd, addr) \