Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

5 files changed, 14 insertions, 34 deletions

diff --git a/usr.bin/rdistd/filesys-os.c b/usr.bin/rdistd/filesys-os.c
index cef5e5e1d0e..e278f1681f3 100644
--- a/usr.bin/rdistd/filesys-os.c
+++ b/usr.bin/rdistd/filesys-os.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filesys-os.c,v 1.8 2003/05/14 01:34:35 millert Exp $	*/
+/*	$OpenBSD: filesys-os.c,v 1.9 2003/06/03 02:56:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
 "$From: filesys-os.c,v 1.5 1999/08/04 15:57:33 christos Exp $";
 #else
 static char RCSid[] __attribute__((__unused__)) = 
-"$OpenBSD: filesys-os.c,v 1.8 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: filesys-os.c,v 1.9 2003/06/03 02:56:15 millert Exp $";
 #endif
 
 static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdistd/filesys.c b/usr.bin/rdistd/filesys.c
index 74d3739d2af..a76448486a5 100644
--- a/usr.bin/rdistd/filesys.c
+++ b/usr.bin/rdistd/filesys.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filesys.c,v 1.9 2003/05/14 01:34:35 millert Exp $	*/
+/*	$OpenBSD: filesys.c,v 1.10 2003/06/03 02:56:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
 "$From: filesys.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
 #else
 static char RCSid[] __attribute__((__unused__)) = 
-"$OpenBSD: filesys.c,v 1.9 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: filesys.c,v 1.10 2003/06/03 02:56:15 millert Exp $";
 #endif
 
 static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdistd/rdistd.1 b/usr.bin/rdistd/rdistd.1
index 00c5f1b1b6a..ec923d1f6e5 100644
--- a/usr.bin/rdistd/rdistd.1
+++ b/usr.bin/rdistd/rdistd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdistd.1,v 1.6 2003/04/21 01:12:02 millert Exp $
+.\"	$OpenBSD: rdistd.1,v 1.7 2003/06/03 02:56:15 millert Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -11,11 +11,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/usr.bin/rdistd/rdistd.c b/usr.bin/rdistd/rdistd.c
index d582a7d7e0a..173197ea3e9 100644
--- a/usr.bin/rdistd/rdistd.c
+++ b/usr.bin/rdistd/rdistd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdistd.c,v 1.5 2003/05/14 01:34:35 millert Exp $	*/
+/*	$OpenBSD: rdistd.c,v 1.6 2003/06/03 02:56:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
 "$From: rdistd.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
 #else
 static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: rdistd.c,v 1.5 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: rdistd.c,v 1.6 2003/06/03 02:56:15 millert Exp $";
 #endif
 
 static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 9454f590562..365753cbc36 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.14 2003/05/14 01:34:35 millert Exp $	*/
+/*	$OpenBSD: server.c,v 1.15 2003/06/03 02:56:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -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.
  *
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
 "$From: server.c,v 1.10 1999/08/04 15:57:33 christos Exp $";
 #else
 static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: server.c,v 1.14 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: server.c,v 1.15 2003/06/03 02:56:15 millert Exp $";
 #endif
 
 static char sccsid[] __attribute__((__unused__)) =