svn commit: r359403 - in head/contrib/telnet: libtelnet telnetd

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:57:36 2020
New Revision: 359403
URL: https://svnweb.freebsd.org/changeset/base/359403

Log:
  Revert 359399: telnet -fno-common bits
  
  There was a large misfire from my local diff that I need to investigate, and
  this version committed did not build.

Modified:
  head/contrib/telnet/libtelnet/encrypt.c
  head/contrib/telnet/telnetd/ext.h
  head/contrib/telnet/telnetd/sys_term.c
  head/contrib/telnet/telnetd/telnetd.c

Modified: head/contrib/telnet/libtelnet/encrypt.c
==============================================================================
--- head/contrib/telnet/libtelnet/encrypt.c	Sat Mar 28 17:36:39 2020	(r359402)
+++ head/contrib/telnet/libtelnet/encrypt.c	Sat Mar 28 17:57:36 2020	(r359403)
@@ -69,6 +69,13 @@ static const char sccsid[] = "@(#)encrypt.c	8.2 (Berke
 #include "encrypt.h"
 #include "misc.h"
 
+/*
+ * These functions pointers point to the current routines
+ * for encrypting and decrypting data.
+ */
+void	(*encrypt_output)(unsigned char *, int);
+int	(*decrypt_input)(int);
+
 int EncryptType(char *type, char *mode);
 int EncryptStart(char *mode);
 int EncryptStop(char *mode);

Modified: head/contrib/telnet/telnetd/ext.h
==============================================================================
--- head/contrib/telnet/telnetd/ext.h	Sat Mar 28 17:36:39 2020	(r359402)
+++ head/contrib/telnet/telnetd/ext.h	Sat Mar 28 17:57:36 2020	(r359403)
@@ -58,7 +58,7 @@ extern int	auth_level;
 
 extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
 
-extern char	*terminaltype;
+char	*terminaltype;
 
 /*
  * I/O data buffers, pointers, and counters.
@@ -175,10 +175,6 @@ void	output_datalen(const char *, int);
 void	startslave(char *, int, char *);
 
 #ifdef	ENCRYPTION
-/*
- * These functions pointers point to the current routines
- * for encrypting and decrypting data.
- */
 extern void	(*encrypt_output)(unsigned char *, int);
 extern int	(*decrypt_input)(int);
 extern char	*nclearto;

Modified: head/contrib/telnet/telnetd/sys_term.c
==============================================================================
--- head/contrib/telnet/telnetd/sys_term.c	Sat Mar 28 17:36:39 2020	(r359402)
+++ head/contrib/telnet/telnetd/sys_term.c	Sat Mar 28 17:57:36 2020	(r359403)
@@ -376,6 +376,8 @@ spcset(int func, cc_t *valp, cc_t **valpp)
  *
  * Returns the file descriptor of the opened pty.
  */
+char line[32];
+
 int
 getpty(int *ptynum __unused)
 {

Modified: head/contrib/telnet/telnetd/telnetd.c
==============================================================================
--- head/contrib/telnet/telnetd/telnetd.c	Sat Mar 28 17:36:39 2020	(r359402)
+++ head/contrib/telnet/telnetd/telnetd.c	Sat Mar 28 17:57:36 2020	(r359403)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef	AUTHENTICATION
 #include <libtelnet/auth.h>
+int	auth_level = 0;
 #endif
 #ifdef	ENCRYPTION
 #include <libtelnet/encrypt.h>