summaryrefslogtreecommitdiff
path: root/sbin/mount_union/mount_union.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 20:06:18 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 20:06:18 +0000
commit38e0625330b89005c91c2a54a07e6c017e2e95a9 (patch)
tree1e01beed6f7cfda9d9f59a5b36931be296cc0bee /sbin/mount_union/mount_union.c
parent3718f103a2f90b47b044fba54ebdbe1d7d983afb (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'sbin/mount_union/mount_union.c')
-rw-r--r--sbin/mount_union/mount_union.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index 93cc15f2551..55401352742 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_union.c,v 1.7 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_union.c,v 1.8 2003/06/02 20:06:16 millert Exp $ */
/* $NetBSD: mount_union.c,v 1.3 1996/04/13 01:32:11 jtc Exp $ */
/*
@@ -16,11 +16,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.
*
@@ -47,7 +43,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94";
#else
-static char rcsid[] = "$OpenBSD: mount_union.c,v 1.7 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_union.c,v 1.8 2003/06/02 20:06:16 millert Exp $";
#endif
#endif /* not lint */