Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Aug 2016 03:39:21 +0000 (UTC)
From:      Luiz Otavio O Souza <loos@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r303864 - stable/11/sbin/pfctl
Message-ID:  <201608090339.u793dLcM007571@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: loos
Date: Tue Aug  9 03:39:21 2016
New Revision: 303864
URL: https://svnweb.freebsd.org/changeset/base/303864

Log:
  MFC r303760:
  
  Fix a regression in pf.conf while parsing the 'interval' keyword.
  
  The bug was introduced by r287009.
  
  PR:		210924
  Submitted by:	kp@
  Sponsored by:	Rubicon Communications (Netgate)
  Pointy hat to:	loos
  Approved by:	re (gjb)

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	Tue Aug  9 02:16:21 2016	(r303863)
+++ stable/11/sbin/pfctl/parse.y	Tue Aug  9 03:39:21 2016	(r303864)
@@ -4460,6 +4460,16 @@ timeout_spec	: STRING NUMBER
 			}
 			free($1);
 		}
+		| INTERVAL NUMBER		{
+			if (check_rulestate(PFCTL_STATE_OPTION))
+				YYERROR;
+			if ($2 < 0 || $2 > UINT_MAX) {
+				yyerror("only positive values permitted");
+				YYERROR;
+			}
+			if (pfctl_set_timeout(pf, "interval", $2, 0) != 0)
+				YYERROR;
+		}
 		;
 
 timeout_list	: timeout_list comma timeout_spec optnl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608090339.u793dLcM007571>