mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-30 08:43:23 +00:00
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.
This commit is contained in:
parent
71f8f48356
commit
42b4e3fb5e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=359403
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#ifdef AUTHENTICATION
|
||||
#include <libtelnet/auth.h>
|
||||
int auth_level = 0;
|
||||
#endif
|
||||
#ifdef ENCRYPTION
|
||||
#include <libtelnet/encrypt.h>
|
||||
|
Loading…
Reference in New Issue
Block a user