Bring over KAME copyright, there is now code from ping in ping6. While

here nuke NetBSD, KAME and BSDI ids. With this the beginning of
ping.c and ping6.c are in sync.
prodding deraadt@

2 files changed, 31 insertions, 8 deletions

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index d01218a74dc..23b2b1aa9e8 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,5 +1,33 @@
-/*	$OpenBSD: ping.c,v 1.178 2016/09/12 06:02:43 florian Exp $	*/
-/*	$NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $	*/
+/*	$OpenBSD: ping.c,v 1.179 2016/09/12 15:47:57 florian Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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) 1989, 1993
@@ -34,8 +62,6 @@
  */
 
 /*
- *			P I N G . C
- *
  * Using the InterNet Control Message Protocol (ICMP) "ECHO" facility,
  * measure round-trip-delays and packet loss across network paths.
  *
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index fae6f903cbf..a8173947ad4 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,5 +1,4 @@
-/*	$OpenBSD: ping6.c,v 1.190 2016/09/12 06:01:58 florian Exp $	*/
-/*	$KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $	*/
+/*	$OpenBSD: ping6.c,v 1.191 2016/09/12 15:47:58 florian Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -30,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-/*	BSDI	ping.c,v 2.3 1996/01/21 17:56:50 jch Exp	*/
-
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.