diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
| commit | b14e72073db609ec0fb89897afe16fc5a15d3290 (patch) | |
| tree | c89a2417dc919aa1ce54db59627c344530c85d79 /sys/contrib/pf/net/if_pflog.c | |
| parent | 33ac8108e208b013f6a23863636e022de6effb3a (diff) | |
| download | FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.zip FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.tar.gz | |
Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step. This is functional as is.
Tested by: freebsd-pf, pfsense.org
Obtained from: OpenBSD
X-MFC after: never (breaks API/ABI)
Diffstat (limited to 'sys/contrib/pf/net/if_pflog.c')
| -rw-r--r-- | sys/contrib/pf/net/if_pflog.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/contrib/pf/net/if_pflog.c index 455f6e5..77b0794 100644 --- a/sys/contrib/pf/net/if_pflog.c +++ b/sys/contrib/pf/net/if_pflog.c @@ -1,5 +1,6 @@ /* $FreeBSD$ */ -/* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */ +/* $OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $ */ + /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -306,11 +307,9 @@ pflog_packet(struct pfi_kif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir, } else { hdr.rulenr = htonl(am->nr); hdr.subrulenr = htonl(rm->nr); - if (ruleset != NULL) - memcpy(hdr.ruleset, ruleset->name, + if (ruleset != NULL && ruleset->anchor != NULL) + strlcpy(hdr.ruleset, ruleset->anchor->name, sizeof(hdr.ruleset)); - - } hdr.dir = dir; |
