summaryrefslogtreecommitdiff
path: root/usr.sbin/rbootd
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:36:56 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:36:56 +0000
commit149854f5f21442a68ead0095592956a96962dcf2 (patch)
treef43fff130e674efd8a82cf223d1143f11fd83184 /usr.sbin/rbootd
parent5269326c4f96790590406db72b6ac8127e33f825 (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'usr.sbin/rbootd')
-rw-r--r--usr.sbin/rbootd/bpf.c10
-rw-r--r--usr.sbin/rbootd/conf.c10
-rw-r--r--usr.sbin/rbootd/defs.h8
-rw-r--r--usr.sbin/rbootd/parseconf.c10
-rw-r--r--usr.sbin/rbootd/pathnames.h8
-rw-r--r--usr.sbin/rbootd/rbootd.88
-rw-r--r--usr.sbin/rbootd/rbootd.c10
-rw-r--r--usr.sbin/rbootd/rmp.h8
-rw-r--r--usr.sbin/rbootd/rmp_var.h8
-rw-r--r--usr.sbin/rbootd/rmpproto.c10
-rw-r--r--usr.sbin/rbootd/utils.c10
11 files changed, 28 insertions, 72 deletions
diff --git a/usr.sbin/rbootd/bpf.c b/usr.sbin/rbootd/bpf.c
index 5812c354653..f5e6ded4b41 100644
--- a/usr.sbin/rbootd/bpf.c
+++ b/usr.sbin/rbootd/bpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf.c,v 1.11 2002/12/13 23:14:07 deraadt Exp $ */
+/* $OpenBSD: bpf.c,v 1.12 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: bpf.c,v 1.5.2.1 1995/11/14 08:45:42 thorpej Exp $ */
/*
@@ -21,11 +21,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.
*
@@ -49,7 +45,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: bpf.c,v 1.11 2002/12/13 23:14:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: bpf.c,v 1.12 2003/06/02 23:36:54 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/rbootd/conf.c b/usr.sbin/rbootd/conf.c
index 3a7d334826a..c077ec07148 100644
--- a/usr.sbin/rbootd/conf.c
+++ b/usr.sbin/rbootd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.4 2002/02/19 18:38:02 mpech Exp $ */
+/* $OpenBSD: conf.c,v 1.5 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: conf.c,v 1.5 1995/10/06 05:12:13 thorpej Exp $ */
/*
@@ -21,11 +21,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.
*
@@ -49,7 +45,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: conf.c,v 1.4 2002/02/19 18:38:02 mpech Exp $";
+static char rcsid[] = "$OpenBSD: conf.c,v 1.5 2003/06/02 23:36:54 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/rbootd/defs.h b/usr.sbin/rbootd/defs.h
index 1743ea76602..be884c6c922 100644
--- a/usr.sbin/rbootd/defs.h
+++ b/usr.sbin/rbootd/defs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: defs.h,v 1.5 2002/02/19 21:04:09 miod Exp $ */
+/* $OpenBSD: defs.h,v 1.6 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: defs.h,v 1.5 1995/10/06 05:12:14 thorpej Exp $ */
/*
@@ -21,11 +21,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.sbin/rbootd/parseconf.c b/usr.sbin/rbootd/parseconf.c
index 60d2a515d4d..f465efbc7e7 100644
--- a/usr.sbin/rbootd/parseconf.c
+++ b/usr.sbin/rbootd/parseconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parseconf.c,v 1.7 2002/12/13 23:14:07 deraadt Exp $ */
+/* $OpenBSD: parseconf.c,v 1.8 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: parseconf.c,v 1.4 1995/10/06 05:12:16 thorpej Exp $ */
/*
@@ -21,11 +21,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.
*
@@ -49,7 +45,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: parseconf.c,v 1.7 2002/12/13 23:14:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parseconf.c,v 1.8 2003/06/02 23:36:54 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/rbootd/pathnames.h b/usr.sbin/rbootd/pathnames.h
index 191f49e4ab1..1f17a0b3619 100644
--- a/usr.sbin/rbootd/pathnames.h
+++ b/usr.sbin/rbootd/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 2001/12/01 23:27:23 miod Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/08/21 17:05:15 thorpej Exp $ */
/*
@@ -21,11 +21,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.sbin/rbootd/rbootd.8 b/usr.sbin/rbootd/rbootd.8
index ed2ad42c5fa..15474c15f64 100644
--- a/usr.sbin/rbootd/rbootd.8
+++ b/usr.sbin/rbootd/rbootd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rbootd.8,v 1.7 2000/11/09 17:53:22 aaron Exp $
+.\" $OpenBSD: rbootd.8,v 1.8 2003/06/02 23:36:54 millert Exp $
.\" $NetBSD: rbootd.8,v 1.3 1995/08/21 17:05:16 thorpej Exp $
.\"
.\" Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -20,11 +20,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.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index dde7cb3ce27..5f6fbb5a19b 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rbootd.c,v 1.16 2002/12/13 23:14:07 deraadt Exp $ */
+/* $OpenBSD: rbootd.c,v 1.17 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: rbootd.c,v 1.5 1995/10/06 05:12:17 thorpej Exp $ */
/*
@@ -21,11 +21,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.
*
@@ -55,7 +51,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rbootd.c,v 1.16 2002/12/13 23:14:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rbootd.c,v 1.17 2003/06/02 23:36:54 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/rbootd/rmp.h b/usr.sbin/rbootd/rmp.h
index c7cdfb65482..171f77fbb30 100644
--- a/usr.sbin/rbootd/rmp.h
+++ b/usr.sbin/rbootd/rmp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmp.h,v 1.2 2001/01/17 00:33:04 pjanzen Exp $ */
+/* $OpenBSD: rmp.h,v 1.3 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: rmp.h,v 1.4 1995/10/06 05:12:18 thorpej Exp $ */
/*
@@ -21,11 +21,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.sbin/rbootd/rmp_var.h b/usr.sbin/rbootd/rmp_var.h
index f5011d11db0..53bf6e591d7 100644
--- a/usr.sbin/rbootd/rmp_var.h
+++ b/usr.sbin/rbootd/rmp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmp_var.h,v 1.4 2002/12/13 23:14:07 deraadt Exp $ */
+/* $OpenBSD: rmp_var.h,v 1.5 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: rmp_var.h,v 1.7.2.1 1995/11/14 08:45:43 thorpej Exp $ */
/*
@@ -21,11 +21,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.sbin/rbootd/rmpproto.c b/usr.sbin/rbootd/rmpproto.c
index 8536db967f7..b6adab5bc25 100644
--- a/usr.sbin/rbootd/rmpproto.c
+++ b/usr.sbin/rbootd/rmpproto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmpproto.c,v 1.8 2002/12/13 23:14:07 deraadt Exp $ */
+/* $OpenBSD: rmpproto.c,v 1.9 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: rmpproto.c,v 1.5.2.1 1995/11/14 08:45:44 thorpej Exp $ */
/*
@@ -21,11 +21,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.
*
@@ -49,7 +45,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rmpproto.c,v 1.8 2002/12/13 23:14:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rmpproto.c,v 1.9 2003/06/02 23:36:54 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/rbootd/utils.c b/usr.sbin/rbootd/utils.c
index fd822a87d4a..460b6d08bb6 100644
--- a/usr.sbin/rbootd/utils.c
+++ b/usr.sbin/rbootd/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.7 2002/12/13 23:14:07 deraadt Exp $ */
+/* $OpenBSD: utils.c,v 1.8 2003/06/02 23:36:54 millert Exp $ */
/* $NetBSD: utils.c,v 1.5.2.1 1995/11/14 08:45:46 thorpej Exp $ */
/*
@@ -21,11 +21,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.
*
@@ -49,7 +45,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: utils.c,v 1.7 2002/12/13 23:14:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: utils.c,v 1.8 2003/06/02 23:36:54 millert Exp $";
#endif /* not lint */
#include <sys/param.h>