svn commit: r223637 - in head: . contrib/pf/authpf contrib/pf/ftp-proxy contrib/pf/man contrib/pf/pfctl contrib/pf/pflogd sbin/pflogd sys/conf sys/contrib/altq/altq sys/contrib/pf/net sys/modules s...

[Bjoern A. Zeeb]

On 16. Dec 2011, at 02:58 , Peter Jeremy wrote:

> On 2011-Jun-28 11:57:25 +0000, "Bjoern A. Zeeb" <bz at FreeBSD.org> wrote:
>> Author: bz
>> Date: Tue Jun 28 11:57:25 2011
>> New Revision: 223637
>> URL: http://svn.freebsd.org/changeset/base/223637
>> 
>> Log:
>> Update packet filter (pf) code to OpenBSD 4.5.
> 
> Further to my mail last Wednesday, I've found nested "#ifdef __FreeBSD__"
> conditionals in pf_ioctl.c as well - it looks like conditional code was
> added to support network stack virtualisation without noting that the
> code was already protectd by a "#ifdef __FreeBSD__".

I have run unifdef on the code before but didn't want to do a sweeping
commit before 9.0 was handled.  The virtualization #ifdefs should go anyway
from the middle of the code and be done with the #define so that Open could
easily pick it up if we'd be at the same level.

Expect that this will be dealt with eventually.

-- 
Bjoern A. Zeeb                                 You have to have visions!
         Stop bit received. Insert coin for new address family.