From dfe0135978f44e2a23be904bea21f4a748a2671c Mon Sep 17 00:00:00 2001
From: julian <julian@FreeBSD.org>
Date: Fri, 9 May 2008 23:53:01 +0000
Subject: Max's changes got left out of the MRT commit.

---
 contrib/pf/pfctl/parse.y | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'contrib/pf')

diff --git a/contrib/pf/pfctl/parse.y b/contrib/pf/pfctl/parse.y
index 3f8993b..9817e8e 100644
--- a/contrib/pf/pfctl/parse.y
+++ b/contrib/pf/pfctl/parse.y
@@ -1027,16 +1027,13 @@ scrub_opt	: NODF	{
 			scrub_opts.randomid = 1;
 		}
 		| RTABLE number				{
-#ifdef __FreeBSD__
-			yyerror("rtable id not supported in FreeBSD, yet");
-			YYERROR;
-#else
+#ifndef __FreeBSD__
 			if ($2 > RT_TABLEID_MAX || $2 < 0) {
 				yyerror("invalid rtable id");
 				YYERROR;
 			}
-			scrub_opts.rtableid = $2;
 #endif
+			scrub_opts.rtableid = $2;
 		}
 		;
 
@@ -1175,16 +1172,13 @@ antispoof_opt	: label	{
 			antispoof_opts.label = $1;
 		}
 		| RTABLE number				{
-#ifdef __FreeBSD__
-			yyerror("rtable id not supported in FreeBSD, yet");
-			YYERROR;
-#else
+#ifndef __FreeBSD__
 			if ($2 > RT_TABLEID_MAX || $2 < 0) {
 				yyerror("invalid rtable id");
 				YYERROR;
 			}
-			antispoof_opts.rtableid = $2;
 #endif
+			antispoof_opts.rtableid = $2;
 		}
 		;
 
@@ -2153,16 +2147,13 @@ filter_opt	: USER uids {
 			free($2);
 		}
 		| RTABLE number				{
-#ifdef __FreeBSD__
-			yyerror("rtable id not supported in FreeBSD, yet");
-			YYERROR;
-#else
+#ifndef __FreeBSD__
 			if ($2 > RT_TABLEID_MAX || $2 < 0) {
 				yyerror("invalid rtable id");
 				YYERROR;
 			}
-			filter_opts.rtableid = $2;
 #endif
+			filter_opts.rtableid = $2;
 		}
 		;
 
-- 
cgit v1.1