diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2011-07-29 10:51:47 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2011-07-29 10:51:47 +0000 |
| commit | a734373c14dbc894b570a9287f78efcc8a59897d (patch) | |
| tree | 215bfa03f712e2212209bc0e2b2be2f785ae18e9 | |
| parent | ee3a3ab84d75d2af69dd9ee5638ca2cdd3622812 (diff) | |
Remove requirement to quote 'debug' loglevel for the 'debug' option.
ok henning
| -rw-r--r-- | sbin/pfctl/parse.y | 8 | ||||
| -rw-r--r-- | share/man/man5/pf.conf.5 | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 11ffd536617..7d75c6b6708 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.606 2011/07/27 00:26:10 mcbride Exp $ */ +/* $OpenBSD: parse.y,v 1.607 2011/07/29 10:51:46 mcbride Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -654,6 +654,12 @@ option : SET REASSEMBLE yesno optnodf { } free($3); } + | SET DEBUG DEBUG { + if (pfctl_set_debug(pf, "debug") != 0) { + yyerror("error setting debuglevel debug"); + YYERROR; + } + } | SET SKIP interface { if (expand_skip_interface($3) != 0) { yyerror("error setting skip interface(s)"); diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 8a276c34f24..a663a6dc830 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pf.conf.5,v 1.503 2011/07/27 07:16:08 jmc Exp $ +.\" $OpenBSD: pf.conf.5,v 1.504 2011/07/29 10:51:46 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 27 2011 $ +.Dd $Mdocdate: July 29 2011 $ .Dt PF.CONF 5 .Os .Sh NAME @@ -1047,9 +1047,6 @@ This should be a keyword from the following ordered list .Cm info , and .Cm debug . -The last keyword, -.Cm debug , -must be quoted. These keywords correspond to the similar (LOG_) values specified to the .Xr syslog 3 library routine. |