Author: garga (ports committer)
Date: Tue Jul 28 14:59:29 2015
New Revision: 285960
URL: https://svnweb.freebsd.org/changeset/base/285960
Log:
Simplify logic added in r285945 as suggested by glebius
Approved by: glebius
MFC after: 3 days
Sponsored by: Netgate
Modified:
head/sys/netpfil/pf/pf.c
Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c Tue Jul 28 14:20:33 2015 (r285959)
+++ head/sys/netpfil/pf/pf.c Tue Jul 28 14:59:29 2015 (r285960)
@@ -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"));
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
