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

Revert r327293

Browse Source 
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.
This commit is contained in:
pfg 2017-12-28 20:10:10 +00:00
parent ae921d2f60
commit ef54d93c46
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet6/ip6_id.c
View File

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