From dafb12ed28cfe17f25e0f13bad8c4b2eb309a584 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 3 Jun 2003 13:06:18 +1000 Subject: a - millert@cvs.openbsd.org 2003/06/03 02:56:16 [scp.c] Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo. --- ChangeLog | 6 +++++- scp.c | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1881189c7..062db6f02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ a UseDNS option, UseDNS is on by default and includes the VerifyReverseMapping check; with itojun@, provos@, jakob@ and deraadt@ ok deraadt@, djm@ + - millert@cvs.openbsd.org 2003/06/03 02:56:16 + [scp.c] + Remove the advertising clause in the UCB license which Berkeley + rescinded 22 July 1999. Proofed by myself and Theo. - (djm) Fix portable-specific uses of verify_reverse_mapping too - (djm) Sync openbsd-compat with OpenBSD CVS. - No more 4-term BSD licenses in our tree @@ -421,4 +425,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2768 2003/06/03 02:45:27 dtucker Exp $ +$Id: ChangeLog,v 1.2769 2003/06/03 03:06:18 djm Exp $ diff --git a/scp.c b/scp.c index 42ebec0fe..72558c75a 100644 --- a/scp.c +++ b/scp.c @@ -52,11 +52,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. * @@ -75,7 +71,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.102 2003/03/05 22:33:43 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.103 2003/06/03 02:56:16 millert Exp $"); #include "xmalloc.h" #include "atomicio.h" -- cgit v1.2.3