svn commit: r222052 - in projects/pf/pf45/contrib/pf: ftp-proxy man pflogd

[Bjoern A. Zeeb]

Author: bz
Date: Wed May 18 08:26:59 2011
New Revision: 222052
URL: http://svn.freebsd.org/changeset/base/222052

Log:
  Cleanup changes from the merge from openbsd.

Modified:
  projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8
  projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c
  projects/pf/pf45/contrib/pf/man/pf.os.5
  projects/pf/pf45/contrib/pf/pflogd/privsep.c

Modified: projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8
==============================================================================
--- projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8	Wed May 18 08:26:59 2011	(r222052)
@@ -14,7 +14,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 26 2008 $
+.\" $FreeBSD$
+.\"
+.Dd February 26, 2008
 .Dt FTP-PROXY 8
 .Os
 .Sh NAME

Modified: projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c
==============================================================================
--- projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c	Wed May 18 08:26:59 2011	(r222052)
@@ -16,6 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/time.h>

Modified: projects/pf/pf45/contrib/pf/man/pf.os.5
==============================================================================
--- projects/pf/pf45/contrib/pf/man/pf.os.5	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/man/pf.os.5	Wed May 18 08:26:59 2011	(r222052)
@@ -13,6 +13,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
 .\" $FreeBSD$
 .\"
 .Dd May 31 2007

Modified: projects/pf/pf45/contrib/pf/pflogd/privsep.c
==============================================================================
--- projects/pf/pf45/contrib/pf/pflogd/privsep.c	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/pflogd/privsep.c	Wed May 18 08:26:59 2011	(r222052)
@@ -16,6 +16,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>