svn commit: r351070 - in head/contrib/telnet: arpa libtelnet telnet telnetd

[Ed Maste]

Author: emaste
Date: Thu Aug 15 13:27:57 2019
New Revision: 351070
URL: https://svnweb.freebsd.org/changeset/base/351070

Log:
  telnet: remove 3rd clause from Berkeley copyrights
  
  Per the July 22, 1999 letter (in /COPYRIGHT) from
  William Hoskins
  Director, Office of Technology Licensing
  University of California, Berkeley
  
  MFC after:	1 week

Modified:
  head/contrib/telnet/arpa/telnet.h
  head/contrib/telnet/libtelnet/auth-proto.h
  head/contrib/telnet/libtelnet/auth.c
  head/contrib/telnet/libtelnet/auth.h
  head/contrib/telnet/libtelnet/enc-proto.h
  head/contrib/telnet/libtelnet/enc_des.c
  head/contrib/telnet/libtelnet/encrypt.c
  head/contrib/telnet/libtelnet/encrypt.h
  head/contrib/telnet/libtelnet/genget.c
  head/contrib/telnet/libtelnet/getent.c
  head/contrib/telnet/libtelnet/kerberos.c
  head/contrib/telnet/libtelnet/kerberos5.c
  head/contrib/telnet/libtelnet/key-proto.h
  head/contrib/telnet/libtelnet/krb4encpwd.c
  head/contrib/telnet/libtelnet/misc-proto.h
  head/contrib/telnet/libtelnet/misc.c
  head/contrib/telnet/libtelnet/misc.h
  head/contrib/telnet/libtelnet/read_password.c
  head/contrib/telnet/libtelnet/rsaencpwd.c
  head/contrib/telnet/telnet/authenc.c
  head/contrib/telnet/telnet/commands.c
  head/contrib/telnet/telnet/defines.h
  head/contrib/telnet/telnet/externs.h
  head/contrib/telnet/telnet/fdset.h
  head/contrib/telnet/telnet/general.h
  head/contrib/telnet/telnet/main.c
  head/contrib/telnet/telnet/network.c
  head/contrib/telnet/telnet/ring.c
  head/contrib/telnet/telnet/ring.h
  head/contrib/telnet/telnet/sys_bsd.c
  head/contrib/telnet/telnet/telnet.1
  head/contrib/telnet/telnet/telnet.c
  head/contrib/telnet/telnet/terminal.c
  head/contrib/telnet/telnet/types.h
  head/contrib/telnet/telnet/utilities.c
  head/contrib/telnet/telnetd/authenc.c
  head/contrib/telnet/telnetd/defs.h
  head/contrib/telnet/telnetd/ext.h
  head/contrib/telnet/telnetd/global.c
  head/contrib/telnet/telnetd/pathnames.h
  head/contrib/telnet/telnetd/slc.c
  head/contrib/telnet/telnetd/state.c
  head/contrib/telnet/telnetd/sys_term.c
  head/contrib/telnet/telnetd/telnetd.8
  head/contrib/telnet/telnetd/telnetd.c
  head/contrib/telnet/telnetd/telnetd.h
  head/contrib/telnet/telnetd/termstat.c
  head/contrib/telnet/telnetd/utility.c

Modified: head/contrib/telnet/arpa/telnet.h
==============================================================================
--- head/contrib/telnet/arpa/telnet.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/arpa/telnet.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/auth-proto.h
==============================================================================
--- head/contrib/telnet/libtelnet/auth-proto.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/auth-proto.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/auth.c
==============================================================================
--- head/contrib/telnet/libtelnet/auth.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/auth.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/auth.h
==============================================================================
--- head/contrib/telnet/libtelnet/auth.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/auth.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/enc-proto.h
==============================================================================
--- head/contrib/telnet/libtelnet/enc-proto.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/enc-proto.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/enc_des.c
==============================================================================
--- head/contrib/telnet/libtelnet/enc_des.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/enc_des.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/encrypt.c
==============================================================================
--- head/contrib/telnet/libtelnet/encrypt.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/encrypt.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/encrypt.h
==============================================================================
--- head/contrib/telnet/libtelnet/encrypt.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/encrypt.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/genget.c
==============================================================================
--- head/contrib/telnet/libtelnet/genget.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/genget.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/getent.c
==============================================================================
--- head/contrib/telnet/libtelnet/getent.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/getent.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/kerberos.c
==============================================================================
--- head/contrib/telnet/libtelnet/kerberos.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/kerberos.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/kerberos5.c
==============================================================================
--- head/contrib/telnet/libtelnet/kerberos5.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/kerberos5.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/key-proto.h
==============================================================================
--- head/contrib/telnet/libtelnet/key-proto.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/key-proto.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/krb4encpwd.c
==============================================================================
--- head/contrib/telnet/libtelnet/krb4encpwd.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/krb4encpwd.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/misc-proto.h
==============================================================================
--- head/contrib/telnet/libtelnet/misc-proto.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/misc-proto.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/misc.c
==============================================================================
--- head/contrib/telnet/libtelnet/misc.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/misc.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/misc.h
==============================================================================
--- head/contrib/telnet/libtelnet/misc.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/misc.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/read_password.c
==============================================================================
--- head/contrib/telnet/libtelnet/read_password.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/read_password.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/libtelnet/rsaencpwd.c
==============================================================================
--- head/contrib/telnet/libtelnet/rsaencpwd.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/libtelnet/rsaencpwd.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/authenc.c
==============================================================================
--- head/contrib/telnet/telnet/authenc.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/authenc.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/commands.c
==============================================================================
--- head/contrib/telnet/telnet/commands.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/commands.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/defines.h
==============================================================================
--- head/contrib/telnet/telnet/defines.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/defines.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/externs.h
==============================================================================
--- head/contrib/telnet/telnet/externs.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/externs.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/fdset.h
==============================================================================
--- head/contrib/telnet/telnet/fdset.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/fdset.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/general.h
==============================================================================
--- head/contrib/telnet/telnet/general.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/general.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/main.c
==============================================================================
--- head/contrib/telnet/telnet/main.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/main.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/network.c
==============================================================================
--- head/contrib/telnet/telnet/network.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/network.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/ring.c
==============================================================================
--- head/contrib/telnet/telnet/ring.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/ring.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/ring.h
==============================================================================
--- head/contrib/telnet/telnet/ring.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/ring.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/sys_bsd.c
==============================================================================
--- head/contrib/telnet/telnet/sys_bsd.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/sys_bsd.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/telnet.1
==============================================================================
--- head/contrib/telnet/telnet/telnet.1	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/telnet.1	Thu Aug 15 13:27:57 2019	(r351070)
@@ -9,11 +9,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.
 .\"

Modified: head/contrib/telnet/telnet/telnet.c
==============================================================================
--- head/contrib/telnet/telnet/telnet.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/telnet.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/terminal.c
==============================================================================
--- head/contrib/telnet/telnet/terminal.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/terminal.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/types.h
==============================================================================
--- head/contrib/telnet/telnet/types.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/types.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnet/utilities.c
==============================================================================
--- head/contrib/telnet/telnet/utilities.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnet/utilities.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/authenc.c
==============================================================================
--- head/contrib/telnet/telnetd/authenc.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/authenc.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/defs.h
==============================================================================
--- head/contrib/telnet/telnetd/defs.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/defs.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/ext.h
==============================================================================
--- head/contrib/telnet/telnetd/ext.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/ext.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/global.c
==============================================================================
--- head/contrib/telnet/telnetd/global.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/global.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/pathnames.h
==============================================================================
--- head/contrib/telnet/telnetd/pathnames.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/pathnames.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/slc.c
==============================================================================
--- head/contrib/telnet/telnetd/slc.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/slc.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/state.c
==============================================================================
--- head/contrib/telnet/telnetd/state.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/state.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/sys_term.c
==============================================================================
--- head/contrib/telnet/telnetd/sys_term.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/sys_term.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/telnetd.8
==============================================================================
--- head/contrib/telnet/telnetd/telnetd.8	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/telnetd.8	Thu Aug 15 13:27:57 2019	(r351070)
@@ -9,11 +9,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.
 .\"

Modified: head/contrib/telnet/telnetd/telnetd.c
==============================================================================
--- head/contrib/telnet/telnetd/telnetd.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/telnetd.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/telnetd.h
==============================================================================
--- head/contrib/telnet/telnetd/telnetd.h	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/telnetd.h	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/termstat.c
==============================================================================
--- head/contrib/telnet/telnetd/termstat.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/termstat.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *

Modified: head/contrib/telnet/telnetd/utility.c
==============================================================================
--- head/contrib/telnet/telnetd/utility.c	Thu Aug 15 12:48:17 2019	(r351069)
+++ head/contrib/telnet/telnetd/utility.c	Thu Aug 15 13:27:57 2019	(r351070)
@@ -10,11 +10,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.
  *