From 38e0625330b89005c91c2a54a07e6c017e2e95a9 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Mon, 2 Jun 2003 20:06:18 +0000
Subject: Remove the advertising clause in the UCB license which Berkeley
 rescinded 22 July 1999.  Proofed by myself and Theo.

---
 sbin/sysctl/pathconf.c | 10 +++-------
 sbin/sysctl/sysctl.8   |  8 ++------
 sbin/sysctl/sysctl.c   | 10 +++-------
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'sbin/sysctl')

diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c
index 936ca4665e7..4f9e725bc27 100644
--- a/sbin/sysctl/pathconf.c
+++ b/sbin/sysctl/pathconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathconf.c,v 1.6 2002/07/03 22:32:34 deraadt Exp $	*/
+/*	$OpenBSD: pathconf.c,v 1.7 2003/06/02 20:06:17 millert Exp $	*/
 /*	$NetBSD: pathconf.c,v 1.2 1995/09/30 07:12:47 thorpej Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -44,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)pathconf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: pathconf.c,v 1.6 2002/07/03 22:32:34 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pathconf.c,v 1.7 2003/06/02 20:06:17 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index dfac610fad0..0f04e4c3514 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.100 2003/05/29 15:25:34 mickey Exp $
+.\"	$OpenBSD: sysctl.8,v 1.101 2003/06/02 20:06:17 millert Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -12,11 +12,7 @@
 .\" 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
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. 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.
 .\"
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 3a50a6f8a05..c7827cde36f 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.c,v 1.93 2003/05/26 08:35:05 tedu Exp $	*/
+/*	$OpenBSD: sysctl.c,v 1.94 2003/06/02 20:06:17 millert Exp $	*/
 /*	$NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -44,7 +40,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)sysctl.c	8.5 (Berkeley) 5/9/95";
 #else
-static char *rcsid = "$OpenBSD: sysctl.c,v 1.93 2003/05/26 08:35:05 tedu Exp $";
+static char *rcsid = "$OpenBSD: sysctl.c,v 1.94 2003/06/02 20:06:17 millert Exp $";
 #endif
 #endif /* not lint */
 
-- 
cgit v1.2.3