From d34258b3dcc24f840b6539aa838cf9d31234ef7c Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 2 Jun 2003 23:28:25 +0000 Subject: Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo. --- sys/miscfs/genfs/layer.h | 8 ++------ sys/miscfs/genfs/layer_extern.h | 8 ++------ sys/miscfs/genfs/layer_subr.c | 8 ++------ sys/miscfs/genfs/layer_vfsops.c | 8 ++------ sys/miscfs/genfs/layer_vnops.c | 10 +++------- 5 files changed, 11 insertions(+), 31 deletions(-) (limited to 'sys/miscfs/genfs') diff --git a/sys/miscfs/genfs/layer.h b/sys/miscfs/genfs/layer.h index c2e4451c16e..954e30dd579 100644 --- a/sys/miscfs/genfs/layer.h +++ b/sys/miscfs/genfs/layer.h @@ -1,4 +1,4 @@ -/* $OpenBSD: layer.h,v 1.1 2003/05/12 20:58:40 tedu Exp $ */ +/* $OpenBSD: layer.h,v 1.2 2003/06/02 23:28:10 millert Exp $ */ /* $NetBSD: layer.h,v 1.4 2001/06/07 13:32:46 wiz Exp $ */ /* @@ -49,11 +49,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/sys/miscfs/genfs/layer_extern.h b/sys/miscfs/genfs/layer_extern.h index 892b637f0a7..64c3643e6c5 100644 --- a/sys/miscfs/genfs/layer_extern.h +++ b/sys/miscfs/genfs/layer_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: layer_extern.h,v 1.1 2003/05/12 20:58:40 tedu Exp $ */ +/* $OpenBSD: layer_extern.h,v 1.2 2003/06/02 23:28:10 millert Exp $ */ /* $NetBSD: layer_extern.h,v 1.5 2001/12/06 04:29:23 chs Exp $ */ /* @@ -48,11 +48,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/sys/miscfs/genfs/layer_subr.c b/sys/miscfs/genfs/layer_subr.c index 5b5ed9eaaac..483a51863b9 100644 --- a/sys/miscfs/genfs/layer_subr.c +++ b/sys/miscfs/genfs/layer_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: layer_subr.c,v 1.1 2003/05/12 20:58:40 tedu Exp $ */ +/* $OpenBSD: layer_subr.c,v 1.2 2003/06/02 23:28:10 millert Exp $ */ /* $NetBSD: layer_subr.c,v 1.11 2002/02/20 06:16:22 enami Exp $ */ /* @@ -48,11 +48,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/sys/miscfs/genfs/layer_vfsops.c b/sys/miscfs/genfs/layer_vfsops.c index 68970c8ca8f..f0fc9cc65ea 100644 --- a/sys/miscfs/genfs/layer_vfsops.c +++ b/sys/miscfs/genfs/layer_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: layer_vfsops.c,v 1.1 2003/05/12 20:58:40 tedu Exp $ */ +/* $OpenBSD: layer_vfsops.c,v 1.2 2003/06/02 23:28:10 millert Exp $ */ /* $NetBSD: layer_vfsops.c,v 1.5 2001/11/15 09:48:21 lukem Exp $ */ /* @@ -48,11 +48,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/sys/miscfs/genfs/layer_vnops.c b/sys/miscfs/genfs/layer_vnops.c index 2b644098d09..2c5e7bf014f 100644 --- a/sys/miscfs/genfs/layer_vnops.c +++ b/sys/miscfs/genfs/layer_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: layer_vnops.c,v 1.1 2003/05/12 20:58:40 tedu Exp $ */ +/* $OpenBSD: layer_vnops.c,v 1.2 2003/06/02 23:28:10 millert Exp $ */ /* $NetBSD: layer_vnops.c,v 1.10 2001/12/06 04:29:23 chs Exp $ */ /* @@ -48,11 +48,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. * @@ -72,7 +68,7 @@ * * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 - * $Id: layer_vnops.c,v 1.1 2003/05/12 20:58:40 tedu Exp $ + * $Id: layer_vnops.c,v 1.2 2003/06/02 23:28:10 millert Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project */ -- cgit v1.2.3