diff options
| author | Sebastian Benoit <benno@cvs.openbsd.org> | 2016-01-05 22:51:39 +0000 |
|---|---|---|
| committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2016-01-05 22:51:39 +0000 |
| commit | 11933600925cacbdbefcc2ad9fc5dff97ca6d2d6 (patch) | |
| tree | 24822e4d6bc04632cdb9347d0867fd8b5089e6b4 | |
| parent | ee6e62bb2b8d1584867f2b2051a249ab004edca4 (diff) | |
remove long deprecated "set debug "none|urgent|misc|loud" levels in
pf.conf. Change this before upgrade or pf.conf won't load.
florian@ henning@ phessler@ jung@
| -rw-r--r-- | sbin/pfctl/pfctl.c | 13 | ||||
| -rw-r--r-- | share/man/man5/pf.conf.5 | 7 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 7748685f9e8..7366dffdbaf 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.332 2015/12/10 17:27:00 mmcc Exp $ */ +/* $OpenBSD: pfctl.c,v 1.333 2016/01/05 22:51:38 benno Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -220,7 +220,6 @@ static const char *tblcmdopt_list[] = { static const char *debugopt_list[] = { "debug", "info", "notice", "warning", "error", "crit", "alert", "emerg", - "none", "urgent", "misc", "loud", NULL }; @@ -1883,15 +1882,7 @@ pfctl_set_debug(struct pfctl *pf, char *d) u_int32_t level; int loglevel; - if (!strcmp(d, "none")) - level = LOG_CRIT; - else if (!strcmp(d, "urgent")) - level = LOG_ERR; - else if (!strcmp(d, "misc")) - level = LOG_NOTICE; - else if (!strcmp(d, "loud")) - level = LOG_DEBUG; - else if ((loglevel = string_to_loglevel(d)) >= 0) + if ((loglevel = string_to_loglevel(d)) >= 0) level = loglevel; else { warnx("unknown debug level \"%s\"", d); diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 87441de2130..9b1e2a86647 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.550 2015/11/03 11:21:16 sobrado Exp $ +.\" $OpenBSD: pf.conf.5,v 1.551 2016/01/05 22:51:38 benno Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier .\" Copyright (c) 2003 - 2013 Henning Brauer <henning@openbsd.org> @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: November 3 2015 $ +.Dd $Mdocdate: January 5 2016 $ .Dt PF.CONF 5 .Os .Sh NAME @@ -2632,7 +2632,8 @@ option = "set" ( [ "timeout" ( timeout | "{" timeout-list "}" ) ] | [ "state-defaults" state-opts ] [ "fingerprints" filename ] | [ "skip on" ifspec ] | - [ "debug" ( "none" | "urgent" | "misc" | "loud" ) ] | + [ "debug" ( "emerg" | "alert" | "crit" | "err" | + "warning" | "notice" | "info" | "debug" ) ] | [ "reassemble" ( "yes" | "no" ) [ "no-df" ] ] ) pf-rule = action [ ( "in" | "out" ) ] |