freebsd-dev/sbin/ipf
Cy Schubert a3522837b0 ipfilter userland: Fix branch mismerge
The work to ANSIfy and adjust returns to style(9) resulted in a mismerge
of a stash when ipfilter was moved from contrib to sbin. An older file
replaced WIP at the time, resulting in a regression.

The majority of this work was done in 2018 saved as git stashes within
a git-svn tree and migrated to the git tree. The regression occurred
when the various stashes were sequentially merged to create individual
commits, following the ipfilter move to netpfil and sbin.

Reported by:	jrtc27
Fixes:		2582ae5740
Pointy hat to:	cy
MFC after:	1 month
2022-01-03 19:39:24 -08:00
..
common ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
ipf ipfilter userland: Fix branch mismerge 2022-01-03 19:39:24 -08:00
ipfs ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
ipfstat ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
ipftest ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
iplang ipfilter: Adjust userland returns to conform to style(9) 2022-01-03 18:06:43 -08:00
ipmon ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
ipnat ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
ippool ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
ipresend ipfilter: Move userland bits to sbin 2021-12-20 06:16:33 -08:00
ipscan ipfilter: Adjust userland returns to conform to style(9) 2022-01-03 18:06:43 -08:00
ipsend ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
libipf ipfilter userland: Style(9) requires a space after return 2022-01-03 19:37:25 -08:00
Makefile ipfilter: Move userland bits to sbin 2021-12-20 06:16:33 -08:00
Makefile.inc ipfilter: Move userland bits to sbin 2021-12-20 06:16:33 -08:00