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...

[Peter Jeremy]

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__".

And cross-checking the $OpenBSD$ tags in the FreeBSD repo against the
OpenBSD CVSweb throws up consistent off-by-one errors - as an example,
src/sys/contrib/pf/net/if_pfsync.h in FreeBSD 9.0 states
"$OpenBSD: if_pfsync.h,v 1.35 2008/06/29 08:42:15 mcbride Exp $"
but the actual content matches if_pfsync.h v1.36 in OpenBSD CVSweb.
Is it possible that the pf code was checked out of an OpenBSD repo
without the correct $OpenBSD$ tag expansion?

This caused me a degree of confusion whilst trying to correlate the
FreeBSD code with the OpenBSD code to try and update bin/124825

-- 
Peter Jeremy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20111216/ee5b3f08/attachment.pgp