diff options
| author | Max Laier <mlaier@FreeBSD.org> | 2004-08-22 16:53:39 +0000 |
|---|---|---|
| committer | Max Laier <mlaier@FreeBSD.org> | 2004-08-22 16:53:39 +0000 |
| commit | 8a7574f3ced06b8564a828b8f9ffc0b905f9b7b5 (patch) | |
| tree | 1dc0b33e2397bd69adb9d0151b597785e8623d4e /contrib/pf | |
| parent | abff3868339c96bb3ce524f66fe7758d3870800a (diff) | |
| download | src-8a7574f3ced06b8564a828b8f9ffc0b905f9b7b5.tar.gz src-8a7574f3ced06b8564a828b8f9ffc0b905f9b7b5.zip | |
Import pfctl_table.c#1.61 from OpenBSD into vendor branch.
Notes
Notes:
svn path=/vendor/pf/dist/; revision=134173
Diffstat (limited to 'contrib/pf')
| -rw-r--r-- | contrib/pf/pfctl/pfctl_table.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/pf/pfctl/pfctl_table.c b/contrib/pf/pfctl/pfctl_table.c index 5d4c3d9f5113..7ad55df6fa74 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); \ |