From d7ff4848cebd8ad79c3a00b29d99239e45ac711a Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Sat, 28 Apr 1990 23:32:20 -0800
Subject: [PATCH] add Berkeley copyright notice

SCCS-vsn: usr.sbin/traceroute/traceroute.8 5.2
SCCS-vsn: usr.sbin/traceroute/traceroute.c 5.2
---
 usr/src/usr.sbin/traceroute/traceroute.8 | 21 +++++---------
 usr/src/usr.sbin/traceroute/traceroute.c | 36 ++++++++++++------------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/usr/src/usr.sbin/traceroute/traceroute.8 b/usr/src/usr.sbin/traceroute/traceroute.8
index db0cf2cbce..65fecf81f3 100644
--- a/usr/src/usr.sbin/traceroute/traceroute.8
+++ b/usr/src/usr.sbin/traceroute/traceroute.8
@@ -1,21 +1,14 @@
-.\" Copyright (c) 1988 The Regents of the University of California.
+.\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" This code is derived from software contributed to Berkeley by
+.\" Van Jacobson.
 .\"
-.\"	$Header: traceroute.8,v 1.1 89/02/28 20:46:12 van Exp $
+.\" %sccs.include.redist.man%
 .\"
-.TH TRACEROUTE 8 "February 28, 1989"
+.\"	@(#)traceroute.8	5.2 (Berkeley) %G%
+.\"
+.TH TRACEROUTE 8 ""
 .UC 6
 .SH NAME
 traceroute \- print the route packets take to network host
diff --git a/usr/src/usr.sbin/traceroute/traceroute.c b/usr/src/usr.sbin/traceroute/traceroute.c
index bfa92e4926..aaba413d28 100644
--- a/usr/src/usr.sbin/traceroute/traceroute.c
+++ b/usr/src/usr.sbin/traceroute/traceroute.c
@@ -1,7 +1,22 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Van Jacobson.
+ *
+ * %sccs.include.redist.c%
+ */
+
 #ifndef lint
-static char *rcsid =
-	"@(#)$Header: traceroute.c,v 1.17 89/02/28 21:01:13 van Exp $ (LBL)";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)traceroute.c	5.2 (Berkeley) %G%";
+#endif /* not lint */
 
 /*
  * traceroute host  - trace the route ip packets follow going to "host".
@@ -172,21 +187,6 @@ static char *rcsid =
  *
  *  -- Van Jacobson (van@helios.ee.lbl.gov)
  *     Tue Dec 20 03:50:13 PST 1988
- *
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #include <stdio.h>
-- 
2.20.1