diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-02-21 17:20:00 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-02-21 17:20:00 +0000 |
| commit | 1ad78757045c6d2b934981a758118e91c30d3ccb (patch) | |
| tree | 465e9b4cb2743500b846111a6c0c0b023821d598 /sys/contrib | |
| parent | a448425842938ffbd5c979639b47bb6c303238bc (diff) | |
| download | FreeBSD-src-1ad78757045c6d2b934981a758118e91c30d3ccb.zip FreeBSD-src-1ad78757045c6d2b934981a758118e91c30d3ccb.tar.gz | |
Fix a terrible braino in pfi_maybe_destroy() and unbreak "$pfctl -Fall" with
renamed interfaces.
PR: kern/77645
Reported by: Harald Schmalzbauer <harryNOschmalzbauerSPAMde>
Reviewed by: yongari
MFC after: 3 days
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/pf/net/pf_if.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c index 21d8c00..438e2ee 100644 --- a/sys/contrib/pf/net/pf_if.c +++ b/sys/contrib/pf/net/pf_if.c @@ -849,10 +849,13 @@ pfi_maybe_destroy(struct pfi_kif *p) int i, j, k, s; struct pfi_kif *q = p->pfik_parent; +#ifdef __FreeBSD__ + if ((p->pfik_flags & (PFI_IFLAG_ATTACHED | PFI_IFLAG_GROUP)) || + ((p->pfik_rules > 0 || p->pfik_states > 0) && + (p->pfik_flags & PFI_IFLAG_PLACEHOLDER) == 0)) +#else if ((p->pfik_flags & (PFI_IFLAG_ATTACHED | PFI_IFLAG_GROUP)) || p->pfik_rules > 0 || p->pfik_states > 0) -#ifdef __FreeBSD__ - if (!(p->pfik_flags & PFI_IFLAG_PLACEHOLDER)) #endif return (0); |
