From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 12:27:12 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 0B7D216A426; Fri, 21 Apr 2006 12:27:12 +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 BF17C16A452
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 12:27:11 +0000 (UTC)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 506AF43D7D
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 12:27:03 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3LCR3GX076751
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 12:27:03 GMT
	(envelope-from soc-bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LCR3DO076748
	for perforce@freebsd.org; Fri, 21 Apr 2006 12:27:03 GMT
	(envelope-from soc-bushman@freebsd.org)
Date: Fri, 21 Apr 2006 12:27:03 GMT
Message-Id: <200604211227.k3LCR3DO076748@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-bushman@freebsd.org using -f
From: soc-bushman <soc-bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95795 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: Fri, 21 Apr 2006 12:27:12 -0000

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

Change 95795 by soc-bushman@soc-bushman_stinger on 2006/04/21 12:26:05

	return value bug fixed in gethostnamadr.c + getaddrinfo.c style fix

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#12 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostnamadr.c#10 edit

Differences ...

==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#12 (text+ko) ====

@@ -1604,7 +1604,7 @@
 
 static int 
 addrinfo_marshal_func(char *buffer, size_t *buffer_size, void *retval, 
-	va_list ap,	void *cache_mdata)
+	va_list ap, void *cache_mdata)
 {
 	struct addrinfo	*ai, *cai;
 	char *p;

==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostnamadr.c#10 (text+ko) ====

@@ -420,6 +420,8 @@
 		for (iter = ht->h_addr_list; *iter; ++iter)
 			NS_APPLY_OFFSET(*iter, orig_buf, p, char *);
 	}
+	
+	*((struct hostent **)retval) = ht;
 	return (NS_SUCCESS);
 }
 #endif /* NS_CACHING */