summaryrefslogtreecommitdiff
path: root/sbin/pfctl/pfctl.c
diff options
context:
space:
mode:
authorDaniel Hartmeier <dhartmei@cvs.openbsd.org>2006-04-24 06:10:55 +0000
committerDaniel Hartmeier <dhartmei@cvs.openbsd.org>2006-04-24 06:10:55 +0000
commitfa191cab73e4256a9e676cde68e37ea05cae5bc7 (patch)
tree0dc647cbecb3c5442f423267566793c7de64f50c /sbin/pfctl/pfctl.c
parentdbecc93eb9ceacdf188eacdbfee2871cbc8ce2b8 (diff)
don't clear interface flags (set skip on) when -N/-F is used without -O,
from Jon Simola, ok henning@
Diffstat (limited to 'sbin/pfctl/pfctl.c')
-rw-r--r--sbin/pfctl/pfctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index a0754509c5a..285d7c31b57 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfctl.c,v 1.244 2005/11/17 20:52:39 dhartmei Exp $ */
+/* $OpenBSD: pfctl.c,v 1.245 2006/04/24 06:10:54 dhartmei Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1929,7 +1929,8 @@ main(int argc, char *argv[])
err(1, "%s", rulesopt);
}
}
- if ((rulesopt != NULL) && (!*anchorname))
+ if ((rulesopt != NULL) && (loadopt & PFCTL_FLAG_OPTION) &&
+ !anchorname[0])
if (pfctl_clear_interface_flags(dev, opts | PF_OPT_QUIET))
error = 1;