diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-03-28 17:57:36 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-03-28 17:57:36 +0000 |
| commit | 42b4e3fb5e83b0f2489b3277d2cc6e22aae8c60d (patch) | |
| tree | aff20cf6e8b2d9c28bfb4ed5f51e160e25899a8e /contrib/telnet | |
| parent | 71f8f48356585b1777d5d6a940c86f810bd20c6a (diff) | |
| download | src-42b4e3fb5e83b0f2489b3277d2cc6e22aae8c60d.tar.gz src-42b4e3fb5e83b0f2489b3277d2cc6e22aae8c60d.zip | |
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.
Notes
Notes:
svn path=/head/; revision=359403
Diffstat (limited to 'contrib/telnet')
| -rw-r--r-- | contrib/telnet/libtelnet/encrypt.c | 7 | ||||
| -rw-r--r-- | contrib/telnet/telnetd/ext.h | 6 | ||||
| -rw-r--r-- | contrib/telnet/telnetd/sys_term.c | 2 | ||||
| -rw-r--r-- | contrib/telnet/telnetd/telnetd.c | 1 |
4 files changed, 11 insertions, 5 deletions
diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c index 7aea87ce44dd..398c7321510c 100644 --- a/contrib/telnet/libtelnet/encrypt.c +++ b/contrib/telnet/libtelnet/encrypt.c @@ -69,6 +69,13 @@ static const char sccsid[] = "@(#)encrypt.c 8.2 (Berkeley) 5/30/95"; #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); diff --git a/contrib/telnet/telnetd/ext.h b/contrib/telnet/telnetd/ext.h index 4da90e2a6ab0..da3b086c153e 100644 --- a/contrib/telnet/telnetd/ext.h +++ b/contrib/telnet/telnetd/ext.h @@ -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; diff --git a/contrib/telnet/telnetd/sys_term.c b/contrib/telnet/telnetd/sys_term.c index 6eb5d8fd6471..2569ee047e2b 100644 --- a/contrib/telnet/telnetd/sys_term.c +++ b/contrib/telnet/telnetd/sys_term.c @@ -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) { diff --git a/contrib/telnet/telnetd/telnetd.c b/contrib/telnet/telnetd/telnetd.c index 522877829735..f4751eef3fe8 100644 --- a/contrib/telnet/telnetd/telnetd.c +++ b/contrib/telnet/telnetd/telnetd.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #ifdef AUTHENTICATION #include <libtelnet/auth.h> +int auth_level = 0; #endif #ifdef ENCRYPTION #include <libtelnet/encrypt.h> |