No functional changes, but:
o unifdef AUTHENTICATE. We have never compiled this code, and its doubtful it will even work in this case. o Style changes (some ansification, some comment updating) o Diff reduction and code style merging with crypto telnet.
This commit is contained in:
parent
2aad70eb9e
commit
5adb5c82e3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=81961
@ -3,7 +3,7 @@
|
||||
|
||||
LIB= telnet
|
||||
|
||||
INTERNALLIB=yes
|
||||
INTERNALLIB= yes
|
||||
INTERNALSTATICLIB=yes
|
||||
NOPIC= yes
|
||||
|
||||
@ -12,7 +12,7 @@ CFLAGS+= -DHAS_CGETENT
|
||||
|
||||
#
|
||||
# Remove obsolete shared libraries, if any. We don't bother moving them
|
||||
# to/usr/lib/compat, since they were only used by telnet, telnetd and
|
||||
# to /usr/lib/compat, since they were only used by telnet, telnetd and
|
||||
# tn3270.
|
||||
#
|
||||
beforeinstall:
|
||||
|
@ -32,7 +32,12 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)genget.c 8.1 (Berkeley) 6/4/93";
|
||||
#if 0
|
||||
static const char sccsid[] = "@(#)genget.c 8.2 (Berkeley) 5/30/95";
|
||||
#else
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
||||
@ -45,12 +50,11 @@ static char sccsid[] = "@(#)genget.c 8.1 (Berkeley) 6/4/93";
|
||||
* the length is returned. If *s1 is a prefix of *s2,
|
||||
* the length of *s1 is returned.
|
||||
*/
|
||||
int
|
||||
isprefix(s1, s2)
|
||||
register char *s1, *s2;
|
||||
int
|
||||
isprefix(char *s1, char *s2)
|
||||
{
|
||||
char *os1;
|
||||
register char c1, c2;
|
||||
char c1, c2;
|
||||
|
||||
if (*s1 == '\0')
|
||||
return(-1);
|
||||
@ -68,14 +72,11 @@ isprefix(s1, s2)
|
||||
|
||||
static char *ambiguous; /* special return value for command routines */
|
||||
|
||||
char **
|
||||
genget(name, table, stlen)
|
||||
char *name; /* name to match */
|
||||
char **table; /* name entry in table */
|
||||
int stlen;
|
||||
char **
|
||||
genget(char *name, char **table, int stlen)
|
||||
{
|
||||
register char **c, **found;
|
||||
register int n;
|
||||
char **c, **found;
|
||||
int n;
|
||||
|
||||
if (name == 0)
|
||||
return 0;
|
||||
@ -96,9 +97,8 @@ genget(name, table, stlen)
|
||||
/*
|
||||
* Function call version of Ambiguous()
|
||||
*/
|
||||
int
|
||||
Ambiguous(s)
|
||||
char *s;
|
||||
int
|
||||
Ambiguous(char *s)
|
||||
{
|
||||
return((char **)s == &ambiguous);
|
||||
}
|
||||
|
@ -32,17 +32,23 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)getent.c 8.2 (Berkeley) 12/15/93";
|
||||
#else
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
#ifdef HAS_CGETENT
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
static char *area;
|
||||
|
||||
/*ARGSUSED*/
|
||||
int
|
||||
getent(cp, name)
|
||||
char *cp, *name;
|
||||
getent(char *cp, char *name)
|
||||
{
|
||||
#ifdef HAS_CGETENT
|
||||
char *dba[2];
|
||||
@ -58,8 +64,7 @@ char *cp, *name;
|
||||
#ifndef SOLARIS
|
||||
/*ARGSUSED*/
|
||||
char *
|
||||
Getstr(id, cpp)
|
||||
char *id, **cpp;
|
||||
Getstr(char *id, char **cpp)
|
||||
{
|
||||
# ifdef HAS_CGETENT
|
||||
char *answer;
|
||||
|
@ -31,6 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)misc-proto.h 8.1 (Berkeley) 6/4/93
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -76,4 +77,5 @@ void net_encrypt P((void));
|
||||
int telnet_spin P((void));
|
||||
char *telnet_getenv P((char *));
|
||||
char *telnet_gets P((char *, char *, int, int));
|
||||
void printsub P((int, unsigned char *, int));
|
||||
#endif
|
||||
|
@ -32,7 +32,12 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93";
|
||||
#if 0
|
||||
static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stdio.h>
|
||||
@ -53,9 +58,6 @@ auth_encrypt_init(local, remote, name, server)
|
||||
{
|
||||
RemoteHostName = remote;
|
||||
LocalHostName = local;
|
||||
#if defined(AUTHENTICATION)
|
||||
auth_init(name, server);
|
||||
#endif
|
||||
if (UserNameRequested) {
|
||||
free(UserNameRequested);
|
||||
UserNameRequested = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user