summaryrefslogtreecommitdiffstats
path: root/sys/netpfil
diff options
context:
space:
mode:
authorgarga <garga@FreeBSD.org>2015-07-28 14:59:29 +0000
committergarga <garga@FreeBSD.org>2015-07-28 14:59:29 +0000
commit0816e5be72d8a1671b6468cf737ff5efb47e04f0 (patch)
tree55633acd36ddb5d03b30054f8c1df9b264ea9776 /sys/netpfil
parentde365b338d0bdace20b97c493c55f1058271f278 (diff)
downloadFreeBSD-src-0816e5be72d8a1671b6468cf737ff5efb47e04f0.zip
FreeBSD-src-0816e5be72d8a1671b6468cf737ff5efb47e04f0.tar.gz
Simplify logic added in r285945 as suggested by glebius
Approved by: glebius MFC after: 3 days Sponsored by: Netgate
Diffstat (limited to 'sys/netpfil')
-rw-r--r--sys/netpfil/pf/pf.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 49781a8..fba0432 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -5895,8 +5895,7 @@ done:
!((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) {
action = PF_DROP;
REASON_SET(&reason, PFRES_IPOPTIONS);
- if (r->log)
- log = 1;
+ log = r->log;
DPFPRINTF(PF_DEBUG_MISC,
("pf: dropping packet with ip options\n"));
}
@@ -6330,8 +6329,7 @@ done:
!((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) {
action = PF_DROP;
REASON_SET(&reason, PFRES_IPOPTIONS);
- if (r->log)
- log = 1;
+ log = r->log;
DPFPRINTF(PF_DEBUG_MISC,
("pf: dropping packet with dangerous v6 headers\n"));
}
OpenPOWER on IntegriCloud