From owner-p4-projects@FreeBSD.ORG  Thu Aug 31 10:36:56 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 3596616A4E0; Thu, 31 Aug 2006 10:36:56 +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 D67A316A4DA
	for <perforce@freebsd.org>; Thu, 31 Aug 2006 10:36:55 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6F08C43D45
	for <perforce@freebsd.org>; Thu, 31 Aug 2006 10:36:55 +0000 (GMT)
	(envelope-from piso@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 k7VAatUC021873
	for <perforce@freebsd.org>; Thu, 31 Aug 2006 10:36:55 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7VAatbq021870
	for perforce@freebsd.org; Thu, 31 Aug 2006 10:36:55 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 31 Aug 2006 10:36:55 GMT
Message-Id: <200608311036.k7VAatbq021870@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105392 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: Thu, 31 Aug 2006 10:36:56 -0000

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

Change 105392 by piso@piso_newluxor on 2006/08/31 10:36:05

	Call LibAliasRefreshModules() from LibAliasInit().

Affected files ...

.. //depot/projects/soc2005/libalias/sbin/natd/natd.c#4 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#6 edit
.. //depot/projects/soc2005/libalias/usr.sbin/ppp/main.c#3 edit

Differences ...

==== //depot/projects/soc2005/libalias/sbin/natd/natd.c#4 (text+ko) ====

@@ -350,9 +350,6 @@
 	signal (SIGTERM, InitiateShutdown);
 	signal (SIGHUP, RefreshAddr);
 
-/* Load all libalias modules */
-	LibAliasRefreshModules();
-
 /*
  * Set alias address if it has been given.
  */

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#6 (text+ko) ====

@@ -2512,6 +2512,9 @@
 #ifndef NO_FW_PUNCH
 	la->fireWallFD = -1;
 #endif
+#ifndef _KERNEL
+	LibAliasRefreshModules();
+#endif
 	return (la);
 }
 

==== //depot/projects/soc2005/libalias/usr.sbin/ppp/main.c#3 (text+ko) ====

@@ -328,7 +328,6 @@
 
 #ifndef NONAT
   PacketAliasInit();
-  LibAliasRefreshModules();
 #endif
   label = ProcessArgs(argc, argv, &sw);