From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 11:33:45 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 36A5616A406; Fri, 21 Apr 2006 11:33:45 +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 E7FD216A404
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 11:33:44 +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 B2E1F43D46
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 11:33:44 +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 k3LBXiHp046561
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 11:33:44 GMT
	(envelope-from soc-bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LBXidc046551
	for perforce@freebsd.org; Fri, 21 Apr 2006 11:33:44 GMT
	(envelope-from soc-bushman@freebsd.org)
Date: Fri, 21 Apr 2006 11:33:44 GMT
Message-Id: <200604211133.k3LBXidc046551@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 95786 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 11:33:45 -0000

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

Change 95786 by soc-bushman@soc-bushman_stinger on 2006/04/21 11:32:45

	cached.conf added to /etc + parameters order fixed in host_id, host_marhsal and host_unmarshal functions

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/etc/cached.conf#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostnamadr.c#9 edit

Differences ...

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

@@ -365,7 +365,6 @@
 	char *str;
 	int len, type;
 	struct hostent *ht;
-	struct hostent_data *ht_data;
 		
 	char *p;	
 	char **iter;
@@ -388,10 +387,8 @@
 	}
 	
 	ht = va_arg(ap, struct hostent *);
-	ht_data = va_arg(ap, struct hostent_data *);
-
-	orig_buf = ht_data->hostbuf;
-	orig_buf_size = sizeof(ht_data->hostbuf);
+	orig_buf = va_arg(ap, char *);
+	orig_buf_size = va_arg(ap, size_t);
 
 	if (orig_buf_size < 
 		buffer_size - sizeof(struct hostent) - sizeof(char *)) {