summaryrefslogtreecommitdiffstats
path: root/contrib/pf/pfctl
diff options
context:
space:
mode:
authormlaier <mlaier@FreeBSD.org>2004-08-22 16:53:39 +0000
committermlaier <mlaier@FreeBSD.org>2004-08-22 16:53:39 +0000
commit51d3d6ad22798e39cfde335297ece533ba5b6fb6 (patch)
tree1dc0b33e2397bd69adb9d0151b597785e8623d4e /contrib/pf/pfctl
parent6a32f6ec2e479ff91d30ed651bcb24ad8d14e84e (diff)
downloadFreeBSD-src-51d3d6ad22798e39cfde335297ece533ba5b6fb6.zip
FreeBSD-src-51d3d6ad22798e39cfde335297ece533ba5b6fb6.tar.gz
Import pfctl_table.c#1.61 from OpenBSD into vendor branch.
Diffstat (limited to 'contrib/pf/pfctl')
-rw-r--r--contrib/pf/pfctl/pfctl_table.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/pf/pfctl/pfctl_table.c b/contrib/pf/pfctl/pfctl_table.c
index 5d4c3d9..7ad55df 100644
--- a/contrib/pf/pfctl/pfctl_table.c
+++ b/contrib/pf/pfctl/pfctl_table.c
@@ -1,4 +1,5 @@
/* $OpenBSD: pfctl_table.c,v 1.59 2004/03/15 15:25:44 dhartmei Exp $ */
+/* add $OpenBSD: pfctl_table.c,v 1.61 2004/06/12 22:22:44 cedric Exp $ */
/*
* Copyright (c) 2002 Cedric Berger
@@ -85,7 +86,13 @@ static const char *istats_text[2][2][2] = {
#define CREATE_TABLE do { \
table.pfrt_flags |= PFR_TFLAG_PERSIST; \
- RVTEST(pfr_add_tables(&table, 1, &nadd, flags)); \
+ if ((!(opts & PF_OPT_NOACTION) || \
+ (opts & PF_OPT_DUMMYACTION)) && \
+ (pfr_add_tables(&table, 1, &nadd, flags)) && \
+ (errno != EPERM)) { \
+ radix_perror(); \
+ goto _error; \
+ } \
if (nadd) { \
warn_namespace_collision(table.pfrt_name); \
xprintf(opts, "%d table created", nadd); \
OpenPOWER on IntegriCloud