summaryrefslogtreecommitdiffstats
path: root/sys/netipx/spx_debug.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-01-08 22:14:00 +0000
committerrwatson <rwatson@FreeBSD.org>2007-01-08 22:14:00 +0000
commit59f7c3de6aaa41b759c58e383744eb37e8b24519 (patch)
tree83191569beaf516b33d6f2f917ea52d440a9d293 /sys/netipx/spx_debug.c
parentebf56f31ede2691b3f9583c21fdbdd3f4a8cb0b6 (diff)
downloadFreeBSD-src-59f7c3de6aaa41b759c58e383744eb37e8b24519.zip
FreeBSD-src-59f7c3de6aaa41b759c58e383744eb37e8b24519.tar.gz
Factor out UCB and my copyrights from copyrights of Mike Mitchell;
the former use a three-clause BSD license (per UCB authorization letter), whereas he uses a four-clause BSD license. MFC after: 3 days
Diffstat (limited to 'sys/netipx/spx_debug.c')
-rw-r--r--sys/netipx/spx_debug.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index 4e4aff8..7a210be 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -1,5 +1,4 @@
/*-
- * Copyright (c) 1995, Mike Mitchell
* Copyright (c) 1984, 1985, 1986, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -11,6 +10,32 @@
* 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.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY 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.
+ *
+ * Copyright (c) 1995, Mike Mitchell
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 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 the University of
OpenPOWER on IntegriCloud