d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license.

Browse Source 
This bring back r327293 from OpenBSD, with the important difference that
we are now getting it from their ip6_id.c file.

Obtained from:	OpenBSD (CVS v1.3)
This commit is contained in:
Pedro F. Giffuni 2017-12-28 20:35:21 +00:00
parent b3c64c30fa
commit a8e6714356
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netinet6/ip6_id.c
View File

@ -1,5 +1,5 @@
/*-
* SPDX-License-Identifier: (BSD-3-Clause AND BSD-4-Clause)
* SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause)
*
* Copyright (C) 2003 WIDE Project.
* All rights reserved.
@ -48,11 +48,6 @@
* 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
@ -65,7 +60,7 @@
* (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: ip6_id.c,v 1.2 2003/12/10 07:21:01 itojun Exp $
* $OpenBSD: ip6_id.c,v 1.3 2003/12/12 06:57:12 itojun Exp $
*/
#include <sys/cdefs.h>