diff options
| author | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2005-05-26 20:20:39 +0000 |
|---|---|---|
| committer | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2005-05-26 20:20:39 +0000 |
| commit | 12113a06fa64014ac278625a7eb37159174ac1ef (patch) | |
| tree | eaa12d621a88e34526d66078c93c082ef8f39012 | |
| parent | 82868d3abe48768b7ca926d1bfe121935e82680e (diff) | |
The illegalness of "no nat log" is already enforced by the grammar.
ok dhartmei
| -rw-r--r-- | sbin/pfctl/parse.y | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index ceb489064cb..46c446b25e6 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.486 2005/05/26 15:29:48 dhartmei Exp $ */ +/* $OpenBSD: parse.y,v 1.487 2005/05/26 20:20:38 camield Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -3184,8 +3184,8 @@ natpass : /* empty */ { $$.b1 = $$.b2 = 0; } ; nataction : no NAT natpass { - if ($1 && ($3.b1 || $3.b2)) { - yyerror("\"pass\" and \"log\" not valid with \"no\""); + if ($1 && $3.b1) { + yyerror("\"pass\" not valid with \"no\""); YYERROR; } if ($1) @@ -3196,8 +3196,8 @@ nataction : no NAT natpass { $$.w = $3.b2; } | no RDR natpass { - if ($1 && ($3.b1 || $3.b2)) { - yyerror("\"pass\" and \"log\" not valid with \"no\""); + if ($1 && $3.b1) { + yyerror("\"pass\" not valid with \"no\""); YYERROR; } if ($1) @@ -3376,8 +3376,8 @@ binatrule : no BINAT natpass interface af proto FROM host TO ipspec tag tagged memset(&binat, 0, sizeof(binat)); - if ($1 && ($3.b1 || $3.b2)) { - yyerror("\"pass\" and \"log\" not valid with \"no\""); + if ($1 && $3.b1) { + yyerror("\"pass\" not valid with \"no\""); YYERROR; } if ($1) |