diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-08-04 12:17:02 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-08-04 12:17:02 +0000 |
| commit | 745f6a963dcbf2238d380ca0b6a33f9d7cf841e3 (patch) | |
| tree | da8229bed7e9ef80673723e5ab77c8847acc7022 /sbin | |
| parent | 641cd035365a076ba381c2edea2060a8de64e614 (diff) | |
don't whine about "cannot load ruleset" when ruleset load wasn't desired
(with pfctl -n)
Jared Yanovich <phirerunner@comcast.net>
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/pfctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 15eb3840683..56f69e942ff 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.183 2003/07/31 22:25:54 cedric Exp $ */ +/* $OpenBSD: pfctl.c,v 1.184 2003/08/04 12:17:01 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -987,7 +987,7 @@ pfctl_rules(int dev, char *filename, int opts, char *anchorname, pf.rule_nr = 0; pf.anchor = anchorname; pf.ruleset = rulesetname; - if (parse_rules(fin, &pf) < 0) + if ((parse_rules(fin, &pf) < 0) && ((opts & PF_OPT_NOACTION) == 0)) ERRX("Syntax error in config file: pf rules not loaded"); if ((altqsupport && (loadopt & PFCTL_FLAG_ALTQ) != 0)) if (check_commit_altq(dev, opts) != 0) |