From owner-p4-projects@FreeBSD.ORG  Tue Jun  9 10:39:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 911421065680; Tue,  9 Jun 2009 10:39:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F7431065686
	for <perforce@freebsd.org>; Tue,  9 Jun 2009 10:39:21 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F28EA8FC18
	for <perforce@freebsd.org>; Tue,  9 Jun 2009 10:39:20 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n59AdKRB065784
	for <perforce@freebsd.org>; Tue, 9 Jun 2009 10:39:20 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n59AdKMi065782
	for perforce@freebsd.org; Tue, 9 Jun 2009 10:39:20 GMT
	(envelope-from zec@fer.hr)
Date: Tue, 9 Jun 2009 10:39:20 GMT
Message-Id: <200906091039.n59AdKMi065782@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163882 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: Tue, 09 Jun 2009 10:39:22 -0000

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

Change 163882 by zec@zec_amdx4 on 2009/06/09 10:39:17

	Unbreak LINT / VLINT build.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw2.c#2 edit
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_nat.c#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw2.c#2 (text+ko) ====

@@ -133,19 +133,6 @@
 static uma_zone_t ipfw_dyn_rule_zone;
 
 /*
- * Data structure to cache our ucred related
- * information. This structure only gets used if
- * the user specified UID/GID based constraints in
- * a firewall rule.
- */
-struct ip_fw_ugid {
-	gid_t		fw_groups[NGROUPS];
-	int		fw_ngroups;
-	uid_t		fw_uid;
-	int		fw_prid;
-};
-
-/*
  * list of rules for layer 3
  */
 #ifdef VIMAGE_GLOBALS
@@ -161,12 +148,6 @@
 ipfw_nat_cfg_t *ipfw_nat_get_cfg_ptr;
 ipfw_nat_cfg_t *ipfw_nat_get_log_ptr;
 
-struct table_entry {
-	struct radix_node	rn[2];
-	struct sockaddr_in	addr, mask;
-	u_int32_t		value;
-};
-
 #ifdef VIMAGE_GLOBALS
 static int autoinc_step;
 #endif

==== //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_nat.c#2 (text+ko) ====

@@ -609,7 +609,7 @@
 	    NULL, EVENTHANDLER_PRI_ANY);
 }
 
-static void
+void
 ipfw_nat_destroy(void)
 {
 	INIT_VNET_IPFW(curvnet);