From owner-svn-src-all@freebsd.org  Fri Jan 13 03:05:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E93BCAD69F;
 Fri, 13 Jan 2017 03:05:46 +0000 (UTC)
 (envelope-from loos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F1EED1F08;
 Fri, 13 Jan 2017 03:05:45 +0000 (UTC)
 (envelope-from loos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0D35jBm014299;
 Fri, 13 Jan 2017 03:05:45 GMT (envelope-from loos@FreeBSD.org)
Received: (from loos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0D35jSG014298;
 Fri, 13 Jan 2017 03:05:45 GMT (envelope-from loos@FreeBSD.org)
Message-Id: <201701130305.v0D35jSG014298@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: loos set sender to
 loos@FreeBSD.org using -f
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Fri, 13 Jan 2017 03:05:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r312004 - stable/11/sbin/pfctl
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jan 2017 03:05:46 -0000

Author: loos
Date: Fri Jan 13 03:05:44 2017
New Revision: 312004
URL: https://svnweb.freebsd.org/changeset/base/312004

Log:
  MFC r310707:
  
  Fix the parsing of NPt binat rules.
  In this specific case the src address can be set to any, which was not
  accepted prior to this commit.
  
  pfSense bug report:	https://redmine.pfsense.org/issues/6985
  Reviewed by:	kp
  Obtained from:	pfSense
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  stable/11/sbin/pfctl/parse.y
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/pfctl/parse.y
==============================================================================
--- stable/11/sbin/pfctl/parse.y	Fri Jan 13 02:12:58 2017	(r312003)
+++ stable/11/sbin/pfctl/parse.y	Fri Jan 13 03:05:44 2017	(r312004)
@@ -4191,7 +4191,7 @@ natrule		: nataction interface af proto 
 		}
 		;
 
-binatrule	: no BINAT natpasslog interface af proto FROM host toipspec tag
+binatrule	: no BINAT natpasslog interface af proto FROM ipspec toipspec tag
 		    tagged rtable redirection
 		{
 			struct pf_rule		binat;