From owner-p4-projects@FreeBSD.ORG  Thu Jan  4 21:19:55 2007
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 A284E16A415; Thu,  4 Jan 2007 21:19:55 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 65E4116A407
	for <perforce@freebsd.org>; Thu,  4 Jan 2007 21:19:55 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5890C13C468
	for <perforce@freebsd.org>; Thu,  4 Jan 2007 21:19:55 +0000 (UTC)
	(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 l04LJtOr031246
	for <perforce@freebsd.org>; Thu, 4 Jan 2007 21:19:55 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l04LJtxo031243
	for perforce@freebsd.org; Thu, 4 Jan 2007 21:19:55 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 4 Jan 2007 21:19:55 GMT
Message-Id: <200701042119.l04LJtxo031243@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 112494 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, 04 Jan 2007 21:19:55 -0000

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

Change 112494 by piso@piso_newluxor on 2007/01/04 21:19:21

	In case IPFIREWALL_NAT was not definied, do not the user add 
	rules with a 'nat' action. 

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#38 edit

Differences ...

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

@@ -4222,9 +4222,13 @@
 			else
 				goto check_size;
 		case O_NAT:
+#ifdef IPFIREWALL_NAT
 			if (cmdlen != F_INSN_SIZE(ipfw_insn_nat))
  				goto bad_size;		
  			goto check_action;
+#else
+			return EINVAL;
+#endif
 		case O_FORWARD_MAC: /* XXX not implemented yet */
 		case O_CHECK_STATE:
 		case O_COUNT: