From owner-svn-src-head@FreeBSD.ORG  Thu Jun 28 03:30:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C9387106566C;
	Thu, 28 Jun 2012 03:30:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B3F428FC12;
	Thu, 28 Jun 2012 03:30:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5S3UHIV049485;
	Thu, 28 Jun 2012 03:30:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5S3UH8m049482;
	Thu, 28 Jun 2012 03:30:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201206280330.q5S3UH8m049482@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 28 Jun 2012 03:30:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237681 - head/share/examples/pf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jun 2012 03:30:17 -0000

Author: rpaulo
Date: Thu Jun 28 03:30:17 2012
New Revision: 237681
URL: http://svn.freebsd.org/changeset/base/237681

Log:
  Add the 'inet' keyword after the nat rule to avoid interfering with
  IPv6.

Modified:
  head/share/examples/pf/faq-example1
  head/share/examples/pf/pf.conf

Modified: head/share/examples/pf/faq-example1
==============================================================================
--- head/share/examples/pf/faq-example1	Thu Jun 28 03:27:35 2012	(r237680)
+++ head/share/examples/pf/faq-example1	Thu Jun 28 03:30:17 2012	(r237681)
@@ -26,7 +26,7 @@ set skip on lo
 scrub in
 
 # nat/rdr
-nat on $ext_if from !($ext_if) -> ($ext_if:0)
+nat on $ext_if inet from !($ext_if) -> ($ext_if:0)
 nat-anchor "ftp-proxy/*"
 rdr-anchor "ftp-proxy/*"
 

Modified: head/share/examples/pf/pf.conf
==============================================================================
--- head/share/examples/pf/pf.conf	Thu Jun 28 03:27:35 2012	(r237680)
+++ head/share/examples/pf/pf.conf	Thu Jun 28 03:30:17 2012	(r237681)
@@ -16,7 +16,7 @@
 
 #nat-anchor "ftp-proxy/*"
 #rdr-anchor "ftp-proxy/*"
-#nat on $ext_if from !($ext_if) -> ($ext_if:0)
+#nat on $ext_if inet from !($ext_if) -> ($ext_if:0)
 #rdr pass on $int_if proto tcp to port ftp -> 127.0.0.1 port 8021
 #no rdr on $ext_if proto tcp from <spamd-white> to any port smtp
 #rdr pass on $ext_if proto tcp from any to any port smtp \