From d981089c62488c24e5c79c2cb10848c5fef5187a Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Tue, 3 Jun 2003 03:06:18 +0000
Subject: [PATCH] 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 | 4 ++++
 scp.c     | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7e33247..0cb05ec9 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
diff --git a/scp.c b/scp.c
index 42ebec0f..72558c75 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"
-- 
2.45.1