svn commit: r244769 - head/sys/netpfil/pf
Gleb Smirnoff
glebius at FreeBSD.org
Fri Dec 28 09:19:51 UTC 2012
Author: glebius
Date: Fri Dec 28 09:19:49 2012
New Revision: 244769
URL: http://svnweb.freebsd.org/changeset/base/244769
Log:
In netpfil/pf:
- Add my copyright to files I've touched a lot this year.
- Add dash in front of all copyright notices according to style(9).
- Move $OpenBSD$ down below copyright notices.
- Remove extra line between cdefs.h and __FBSDID.
Modified:
head/sys/netpfil/pf/if_pflog.c
head/sys/netpfil/pf/if_pfsync.c
head/sys/netpfil/pf/pf.c
head/sys/netpfil/pf/pf_if.c
head/sys/netpfil/pf/pf_ioctl.c
head/sys/netpfil/pf/pf_lb.c
head/sys/netpfil/pf/pf_norm.c
head/sys/netpfil/pf/pf_osfp.c
head/sys/netpfil/pf/pf_ruleset.c
head/sys/netpfil/pf/pf_table.c
Modified: head/sys/netpfil/pf/if_pflog.c
==============================================================================
--- head/sys/netpfil/pf/if_pflog.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/if_pflog.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,5 +1,4 @@
-/* $OpenBSD: if_pflog.c,v 1.26 2007/10/18 21:58:18 mpf Exp $ */
-/*
+/*-
* The authors of this code are John Ioannidis (ji at tla.org),
* Angelos D. Keromytis (kermit at csd.uch.gr) and
* Niels Provos (provos at physnet.uni-hamburg.de).
@@ -31,6 +30,8 @@
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
* MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
* PURPOSE.
+ *
+ * $OpenBSD: if_pflog.c,v 1.26 2007/10/18 21:58:18 mpf Exp $
*/
#include <sys/cdefs.h>
Modified: head/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- head/sys/netpfil/pf/if_pfsync.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/if_pfsync.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,7 +1,6 @@
-/* $OpenBSD: if_pfsync.c,v 1.110 2009/02/24 05:39:19 dlg Exp $ */
-
-/*
+/*-
* Copyright (c) 2002 Michael Shalayeff
+ * Copyright (c) 2012 Gleb Smirnoff <glebius at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 2009 David Gwynne <dlg at openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -43,6 +42,8 @@
*/
/*
+ * $OpenBSD: if_pfsync.c,v 1.110 2009/02/24 05:39:19 dlg Exp $
+ *
* Revisions picked from OpenBSD after revision 1.110 import:
* 1.119 - don't m_copydata() beyond the len of mbuf in pfsync_input()
* 1.118, 1.124, 1.148, 1.149, 1.151, 1.171 - fixes to bulk updates
Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,8 +1,7 @@
-/* $OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $ */
-
-/*
+/*-
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002 - 2008 Henning Brauer
+ * Copyright (c) 2012 Gleb Smirnoff <glebius at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,10 +32,10 @@
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F30602-01-2-0537.
*
+ * $OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $
*/
#include <sys/cdefs.h>
-
__FBSDID("$FreeBSD$");
#include "opt_inet.h"
Modified: head/sys/netpfil/pf/pf_if.c
==============================================================================
--- head/sys/netpfil/pf/pf_if.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_if.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,10 +1,9 @@
-/* $OpenBSD: pf_if.c,v 1.54 2008/06/14 16:55:28 mk Exp $ */
-
-/*
- * Copyright 2005 Henning Brauer <henning at openbsd.org>
- * Copyright 2005 Ryan McBride <mcbride at openbsd.org>
+/*-
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2003 Cedric Berger
+ * Copyright (c) 2005 Henning Brauer <henning at openbsd.org>
+ * Copyright (c) 2005 Ryan McBride <mcbride at openbsd.org>
+ * Copyright (c) 2012 Gleb Smirnoff <glebius at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,10 +29,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $OpenBSD: pf_if.c,v 1.54 2008/06/14 16:55:28 mk Exp $
*/
#include <sys/cdefs.h>
-
__FBSDID("$FreeBSD$");
#include "opt_inet.h"
Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_ioctl.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,8 +1,7 @@
-/* $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $ */
-
-/*
+/*-
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002,2003 Henning Brauer
+ * Copyright (c) 2012 Gleb Smirnoff <glebius at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,6 +32,7 @@
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F30602-01-2-0537.
*
+ * $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $
*/
#include <sys/cdefs.h>
Modified: head/sys/netpfil/pf/pf_lb.c
==============================================================================
--- head/sys/netpfil/pf/pf_lb.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_lb.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,6 +1,4 @@
-/* $OpenBSD: pf_lb.c,v 1.2 2009/02/12 02:13:15 sthen Exp $ */
-
-/*
+/*-
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002 - 2008 Henning Brauer
* All rights reserved.
@@ -33,6 +31,7 @@
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F30602-01-2-0537.
*
+ * $OpenBSD: pf_lb.c,v 1.2 2009/02/12 02:13:15 sthen Exp $
*/
#include <sys/cdefs.h>
Modified: head/sys/netpfil/pf/pf_norm.c
==============================================================================
--- head/sys/netpfil/pf/pf_norm.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_norm.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,6 +1,4 @@
-/* $OpenBSD: pf_norm.c,v 1.114 2009/01/29 14:11:45 henning Exp $ */
-
-/*
+/*-
* Copyright 2001 Niels Provos <provos at citi.umich.edu>
* All rights reserved.
*
@@ -23,6 +21,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $OpenBSD: pf_norm.c,v 1.114 2009/01/29 14:11:45 henning Exp $
*/
#include <sys/cdefs.h>
Modified: head/sys/netpfil/pf/pf_osfp.c
==============================================================================
--- head/sys/netpfil/pf/pf_osfp.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_osfp.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,6 +1,4 @@
-/* $OpenBSD: pf_osfp.c,v 1.14 2008/06/12 18:17:01 henning Exp $ */
-
-/*
+/*-
* Copyright (c) 2003 Mike Frantzen <frantzen at w4g.org>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,6 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
+ * $OpenBSD: pf_osfp.c,v 1.14 2008/06/12 18:17:01 henning Exp $
*/
#include <sys/cdefs.h>
Modified: head/sys/netpfil/pf/pf_ruleset.c
==============================================================================
--- head/sys/netpfil/pf/pf_ruleset.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_ruleset.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,6 +1,4 @@
-/* $OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $ */
-
-/*
+/*-
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002,2003 Henning Brauer
* All rights reserved.
@@ -33,6 +31,7 @@
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F30602-01-2-0537.
*
+ * $OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $
*/
#include <sys/cdefs.h>
Modified: head/sys/netpfil/pf/pf_table.c
==============================================================================
--- head/sys/netpfil/pf/pf_table.c Fri Dec 28 08:00:31 2012 (r244768)
+++ head/sys/netpfil/pf/pf_table.c Fri Dec 28 09:19:49 2012 (r244769)
@@ -1,6 +1,4 @@
-/* $OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $ */
-
-/*
+/*-
* Copyright (c) 2002 Cedric Berger
* All rights reserved.
*
@@ -28,6 +26,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
+ * $OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $
*/
#include <sys/cdefs.h>
More information about the svn-src-head
mailing list