svn commit: r303760 - head/sbin/pfctl

[Luiz Otavio O Souza]

Author: loos
Date: Fri Aug  5 02:19:03 2016
New Revision: 303760
URL: https://svnweb.freebsd.org/changeset/base/303760

Log:
  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

Modified:
  head/sbin/pfctl/parse.y

Modified: head/sbin/pfctl/parse.y
==============================================================================
--- head/sbin/pfctl/parse.y	Fri Aug  5 00:00:02 2016	(r303759)
+++ head/sbin/pfctl/parse.y	Fri Aug  5 02:19:03 2016	(r303760)
@@ -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