summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhartmei <dhartmei@openbsd.org>2006-04-24 06:10:54 +0000
committerdhartmei <dhartmei@openbsd.org>2006-04-24 06:10:54 +0000
commit01e0d72728381de1ddb68baea1eb0cfd765e6c1d (patch)
tree201b03208e691d859e4913fc886b555d1467161b
parento Better match GNU behavior (a bare -t does NOT read from stdin, (diff)
downloadwireguard-openbsd-01e0d72728381de1ddb68baea1eb0cfd765e6c1d.tar.xz
wireguard-openbsd-01e0d72728381de1ddb68baea1eb0cfd765e6c1d.zip
don't clear interface flags (set skip on) when -N/-F is used without -O,
from Jon Simola, ok henning@
-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;