From: schwarze Date: Wed, 20 May 2015 23:39:55 +0000 (+0000) Subject: Remove clauses 3 and 4 from Christos Zoulas' BSD license. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9902a235df1b251f0dcfe2bdb6b4183679f9df97;p=openbsd Remove clauses 3 and 4 from Christos Zoulas' BSD license. This is safe because Christos did that himself in NetBSD in 2008. No code change. --- diff --git a/usr.bin/ftp/stringlist.c b/usr.bin/ftp/stringlist.c index 1c5e346b4c6..0e7628721d2 100644 --- a/usr.bin/ftp/stringlist.c +++ b/usr.bin/ftp/stringlist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stringlist.c,v 1.11 2014/10/08 04:01:10 doug Exp $ */ +/* $OpenBSD: stringlist.c,v 1.12 2015/05/20 23:39:55 schwarze Exp $ */ /* $NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $ */ /* @@ -13,11 +13,6 @@ * 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 Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.bin/ftp/stringlist.h b/usr.bin/ftp/stringlist.h index b0f1fae8c33..b33bbf08629 100644 --- a/usr.bin/ftp/stringlist.h +++ b/usr.bin/ftp/stringlist.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stringlist.h,v 1.4 2012/12/05 23:20:25 deraadt Exp $ */ +/* $OpenBSD: stringlist.h,v 1.5 2015/05/20 23:39:55 schwarze Exp $ */ /* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ /* @@ -13,11 +13,6 @@ * 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 Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED