From 51d3d6ad22798e39cfde335297ece533ba5b6fb6 Mon Sep 17 00:00:00 2001
From: mlaier <mlaier@FreeBSD.org>
Date: Sun, 22 Aug 2004 16:53:39 +0000
Subject: Import pfctl_table.c#1.61 from OpenBSD into vendor branch.

---
 contrib/pf/pfctl/pfctl_table.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'contrib/pf')

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);	\
-- 
cgit v1.1