From 9d39900498eb815570c8ffdc760c222d52041f48 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 27 Nov 2023 16:47:37 +0000
Subject: [PATCH] telnet: remove locally added __FBSDID

This partially reverts 77b7cdf1999ee965ad494fddd184b18f532ac91a.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D42704

(cherry picked from commit a3c858005cae175e277f6f6735ca9eaea7eaf3c3)
---
 contrib/telnet/libtelnet/auth.c          | 3 ---
 contrib/telnet/libtelnet/enc_des.c       | 2 --
 contrib/telnet/libtelnet/encrypt.c       | 4 ----
 contrib/telnet/libtelnet/genget.c        | 4 ----
 contrib/telnet/libtelnet/getent.c        | 4 ----
 contrib/telnet/libtelnet/kerberos.c      | 4 ----
 contrib/telnet/libtelnet/kerberos5.c     | 4 ----
 contrib/telnet/libtelnet/krb4encpwd.c    | 4 ----
 contrib/telnet/libtelnet/misc.c          | 4 ----
 contrib/telnet/libtelnet/pk.c            | 4 ----
 contrib/telnet/libtelnet/read_password.c | 4 ----
 contrib/telnet/libtelnet/rsaencpwd.c     | 4 ----
 contrib/telnet/libtelnet/sra.c           | 4 ----
 contrib/telnet/telnet/authenc.c          | 2 --
 contrib/telnet/telnet/commands.c         | 2 --
 contrib/telnet/telnet/main.c             | 2 --
 contrib/telnet/telnet/network.c          | 2 --
 contrib/telnet/telnet/ring.c             | 2 --
 contrib/telnet/telnet/sys_bsd.c          | 2 --
 contrib/telnet/telnet/telnet.c           | 2 --
 contrib/telnet/telnet/terminal.c         | 2 --
 contrib/telnet/telnet/utilities.c        | 2 --
 22 files changed, 67 deletions(-)

diff --git a/contrib/telnet/libtelnet/auth.c b/contrib/telnet/libtelnet/auth.c
index 3488edd84b1..fa1cfdc5286 100644
--- a/contrib/telnet/libtelnet/auth.c
+++ b/contrib/telnet/libtelnet/auth.c
@@ -33,9 +33,6 @@
 static const char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 
 /*
  * Copyright (C) 1990 by the Massachusetts Institute of Technology
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c
index 2c12ad5e0cf..0cd9cb44ce0 100644
--- a/contrib/telnet/libtelnet/enc_des.c
+++ b/contrib/telnet/libtelnet/enc_des.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #ifdef	ENCRYPTION
 # ifdef	AUTHENTICATION
diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c
index 398c7321510..3c4a2ab1abc 100644
--- a/contrib/telnet/libtelnet/encrypt.c
+++ b/contrib/telnet/libtelnet/encrypt.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 #if 0
 static const char sccsid[] = "@(#)encrypt.c	8.2 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/genget.c b/contrib/telnet/libtelnet/genget.c
index e7b48f6b2af..4bb11931574 100644
--- a/contrib/telnet/libtelnet/genget.c
+++ b/contrib/telnet/libtelnet/genget.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 #if 0
 static const char sccsid[] = "@(#)genget.c	8.2 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/getent.c b/contrib/telnet/libtelnet/getent.c
index 3df81409a7d..3be745e96c0 100644
--- a/contrib/telnet/libtelnet/getent.c
+++ b/contrib/telnet/libtelnet/getent.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)getent.c	8.2 (Berkeley) 12/15/93";
diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c
index 5f00fd40187..a5dc774d54c 100644
--- a/contrib/telnet/libtelnet/kerberos.c
+++ b/contrib/telnet/libtelnet/kerberos.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
diff --git a/contrib/telnet/libtelnet/kerberos5.c b/contrib/telnet/libtelnet/kerberos5.c
index 63f515310f9..bc90ec9cfa6 100644
--- a/contrib/telnet/libtelnet/kerberos5.c
+++ b/contrib/telnet/libtelnet/kerberos5.c
@@ -47,10 +47,6 @@
  * or implied warranty.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifdef	KRB5
 
 #include <arpa/telnet.h>
diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c
index e87b5c41272..345e2431722 100644
--- a/contrib/telnet/libtelnet/krb4encpwd.c
+++ b/contrib/telnet/libtelnet/krb4encpwd.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
diff --git a/contrib/telnet/libtelnet/misc.c b/contrib/telnet/libtelnet/misc.c
index ef5de4ee45e..a514376e2b6 100644
--- a/contrib/telnet/libtelnet/misc.c
+++ b/contrib/telnet/libtelnet/misc.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 #if 0
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/4/93";
diff --git a/contrib/telnet/libtelnet/pk.c b/contrib/telnet/libtelnet/pk.c
index a3d17f396c6..a36733c4e73 100644
--- a/contrib/telnet/libtelnet/pk.c
+++ b/contrib/telnet/libtelnet/pk.c
@@ -28,10 +28,6 @@
  * 
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 /* public key routines */
 /* functions:
 	genkeys(char *public, char *secret)
diff --git a/contrib/telnet/libtelnet/read_password.c b/contrib/telnet/libtelnet/read_password.c
index 0faaa09c57d..37baf92e288 100644
--- a/contrib/telnet/libtelnet/read_password.c
+++ b/contrib/telnet/libtelnet/read_password.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)read_password.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/rsaencpwd.c b/contrib/telnet/libtelnet/rsaencpwd.c
index 9dcf4a658cf..10225ac0070 100644
--- a/contrib/telnet/libtelnet/rsaencpwd.c
+++ b/contrib/telnet/libtelnet/rsaencpwd.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static char sccsid[] = "@(#)rsaencpwd.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
diff --git a/contrib/telnet/libtelnet/sra.c b/contrib/telnet/libtelnet/sra.c
index 4a759685ca4..abacda12b49 100644
--- a/contrib/telnet/libtelnet/sra.c
+++ b/contrib/telnet/libtelnet/sra.c
@@ -28,10 +28,6 @@
  * 
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifdef	SRA
 #ifdef	ENCRYPTION
 #include <sys/types.h>
diff --git a/contrib/telnet/telnet/authenc.c b/contrib/telnet/telnet/authenc.c
index 593d061d125..6fd4b9f4dd8 100644
--- a/contrib/telnet/telnet/authenc.c
+++ b/contrib/telnet/telnet/authenc.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c
index dbc06a10b9c..ca3460e455a 100644
--- a/contrib/telnet/telnet/commands.c
+++ b/contrib/telnet/telnet/commands.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/un.h>
diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c
index 8ebcc0a8625..973e2b09a58 100644
--- a/contrib/telnet/telnet/main.c
+++ b/contrib/telnet/telnet/main.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/network.c b/contrib/telnet/telnet/network.c
index 9a62e8a94fa..438673ce3e0 100644
--- a/contrib/telnet/telnet/network.c
+++ b/contrib/telnet/telnet/network.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/ring.c b/contrib/telnet/telnet/ring.c
index 138e3c66104..d0e194c7d41 100644
--- a/contrib/telnet/telnet/ring.c
+++ b/contrib/telnet/telnet/ring.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 /*
  * This defines a structure for a ring buffer.
diff --git a/contrib/telnet/telnet/sys_bsd.c b/contrib/telnet/telnet/sys_bsd.c
index fd57df7a88a..01209782cdb 100644
--- a/contrib/telnet/telnet/sys_bsd.c
+++ b/contrib/telnet/telnet/sys_bsd.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 /*
  * The following routines try to encapsulate what is system dependent
diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c
index b6b2432ef3e..a35ea40c4cd 100644
--- a/contrib/telnet/telnet/telnet.c
+++ b/contrib/telnet/telnet/telnet.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/contrib/telnet/telnet/terminal.c b/contrib/telnet/telnet/terminal.c
index b42f861c6f3..dccfab41099 100644
--- a/contrib/telnet/telnet/terminal.c
+++ b/contrib/telnet/telnet/terminal.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <arpa/telnet.h>
 #include <sys/types.h>
diff --git a/contrib/telnet/telnet/utilities.c b/contrib/telnet/telnet/utilities.c
index 36432e6a32f..516c1e5e538 100644
--- a/contrib/telnet/telnet/utilities.c
+++ b/contrib/telnet/telnet/utilities.c
@@ -32,8 +32,6 @@
 static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #define	TELOPTS
 #define	TELCMDS