MFC 317830:

Ifdef out a redundant if statement when INET6 is disabled.

Revert r318203: Neglected to put "MFC 318203:" in the log.

Pointy hat to: cy

Ifdef out a redundant if statement when INET6 is disabled.

MFC r316993, r316994, r316997 as follows:

r316993:

Fix CID 1372601 in ipfilter/lib/parsefields.c, possible NULL pointer
dereference should reallocarray() fail.

Reported by: Coverity CID 1372601

r316994:

Fix CID 1372600 in ipfilter/tools/ipf_y.y, possible NULL pointer
dereference should reallocarray() fail.

Reported by: Coverity CID 1372600

r316997:

Use warnx() to issue error message.

Reported by: cem

MFC r312791:

Use normal KNF cuddling of elses.

Reported by: bde

MFC r312777, r312780:

Issue an error message when an incorrect flush argument is encountered
(and style fixup).

MFC r302296:

Remove dead code.

MFC r283295: ipf(1): Use strchr(3) instead of deprecated index(3)

Sponsored by: The FreeBSD Foundation

MFC r271978

ipfilter bug #552 destination port not zero after parsing nat rule.

Obtained from: netbsd CVS repo (r1.4), ipfilter CVS repo (r1.38)

MFC r271977

3561691 gethost never returns an ipv6 address

Obtained from: ipfilter CVS repo (r1.34), netbsd CVS repo (r1.4)

MFC r271974

ipfilter bug #551 ipf.conf address structure not properly zero filled.

Obtained from: ipfilter CVS repo (r1.37), netbsd CVS repo (r1.3)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Update ipfilter 4.1.28 --> 5.1.2.

Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)

Use pcap's bpf header, not our own copy of it.

Fix a typo that causes the for loop to exit immediately. There's
identical loop a few lines above.

Reviewed by: sam
Approved by: ed (mentor)
Silence from: darrenr (maintainer)

2020447 IPFilter's NAT can undo name server random port selection

Approved by: darrenr
MFC after: 1 week
Security: CERT VU#521769

Pullup IPFilter 4.1.28 from the vendor branch into HEAD.

MFC after: 7 days

ipfstat should parse "any" when used with -D/-S command line options

PR: bin/113879
Submitted by: kabe@sra-tohoku.co.jp
Reviewed by: darrenr
Approved by: re

Merge IPFilter 4.1.23 back to HEAD
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13

This commit was generated by cvs2svn to compensate for changes in r170263,
which included commits to RCS files with non-trunk default branches.

Resolve conflicts

MFC after: 1 weeks

fix "ipf -Z" reporting rubbish and possibly panic'ing box

MFC after: 4 days

Resolve conflicts (and believe me...you don't want to know).

arm defaults to unsigned char as well.

Enable building /sbin/ipf (but not the rescue version) with the ability to
parse bpf strings for filter rules in ipf.conf

Fix tinderbox build on ppc.

Requested by: mlaier

Patches from Ruslam Ermilov to remove NetBSD bits from Makefiles and cleanup
build problems with rescue.

Fix include directives that were missing the netinet include directory, where
the ipl.h file is found. Also add back in ip_fil.c, which somehow went missing
in action.

* Someone imported a lot of files with the wrong CVS tag, so lots of files need
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

This commit was generated by cvs2svn to compensate for changes in r145510,
which included commits to RCS files with non-trunk default branches.