diff options
| author |   dhartmei <dhartmei@openbsd.org> | 2003-08-22 17:24:27 +0000 |
|---|---|---|
| committer | dhartmei <dhartmei@openbsd.org> | 2003-08-22 17:24:27 +0000 |
| commit | e54e67096e74272af3eeaca59553b02a75147289 (patch) | |
| tree | c25e2d9ba23cfd6a84686431a07ada9328ef83fb | |
| parent | +spamd (oups) (diff) | |
| download | wireguard-openbsd-e54e67096e74272af3eeaca59553b02a75147289.tar.xz wireguard-openbsd-e54e67096e74272af3eeaca59553b02a75147289.zip | |
move pfctl_file_fingerprints() call, table commands can use -f themselves
(like pfctl -t spammers -vvTt -f file, causing EPERM on DIOCOSFPFLUSH).
| -rw-r--r-- | sbin/pfctl/pfctl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index a06d538d5a7..5cb8e81f1f4 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.186 2003/08/21 19:12:08 frantzen Exp $ */ +/* $OpenBSD: pfctl.c,v 1.187 2003/08/22 17:24:27 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1579,9 +1579,6 @@ main(int argc, char *argv[]) if (state_killers) pfctl_kill_states(dev, opts); - if (rulesopt && pfctl_file_fingerprints(dev, opts, PF_OSFP_FILE)) - error = 1; - if (tblcmdopt != NULL) { error = pfctl_command_tables(argc, argv, tableopt, tblcmdopt, rulesopt, anchorname, rulesetname, opts); @@ -1589,6 +1586,10 @@ main(int argc, char *argv[]) } if (rulesopt != NULL) + if (pfctl_file_fingerprints(dev, opts, PF_OSFP_FILE)) + error = 1; + + if (rulesopt != NULL) if (pfctl_rules(dev, rulesopt, opts, anchorname, rulesetname)) error = 1; |