mop up some more 3/4 license issues

1 files changed, 3 insertions, 9 deletions

diff --git a/usr.bin/ssh/LICENCE b/usr.bin/ssh/LICENCE
index 011baf22cbd..60e885775a5 100644
--- a/usr.bin/ssh/LICENCE
+++ b/usr.bin/ssh/LICENCE
@@ -134,11 +134,9 @@ OpenSSH contains no GPL code.
      * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 5)
-    One component of the ssh source code is under a 4-clause BSD license,
+    One component of the ssh source code is under a 3-clause BSD license,
     held by the University of California, since we pulled these parts from
-    original Berkeley code.  The Regents of the University of California
-    have declared that term 3 is no longer enforceable on their source code,
-    but we retain that license as is.
+    original Berkeley code.
 
      * Copyright (c) 1983, 1990, 1992, 1993, 1995
      *      The Regents of the University of California.  All rights reserved.
@@ -151,11 +149,7 @@ OpenSSH contains no GPL code.
      * 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.
      *