svn commit: r327294 - head/sys/netinet6

[Pedro F. Giffuni]

Author: pfg
Date: Thu Dec 28 20:10:10 2017
New Revision: 327294
URL: https://svnweb.freebsd.org/changeset/base/327294

Log:
  Revert r327293
  netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license.
  
  I was looking at the wrong file. There is an important merge that must be
  done before I can bring this change.

Modified:
  head/sys/netinet6/ip6_id.c

Modified: head/sys/netinet6/ip6_id.c
==============================================================================
--- head/sys/netinet6/ip6_id.c	Thu Dec 28 19:42:53 2017	(r327293)
+++ head/sys/netinet6/ip6_id.c	Thu Dec 28 20:10:10 2017	(r327294)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause)
+ * SPDX-License-Identifier: (BSD-3-Clause AND BSD-4-Clause)
  *
  * Copyright (C) 2003 WIDE Project.
  * All rights reserved.
@@ -48,6 +48,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES