d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from master (crypto) telnet. WARNS fixes for alpha.

Browse Source
This commit is contained in:
Mark Murray 2001-12-03 12:41:19 +00:00
parent 5eb2b33ad8
commit 7a32b4b1c6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=87268
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/arpa/telnet.h
View File

@ -64,7 +64,7 @@
#define SYNCH 242 /* for telfunc calls */
#ifdef TELCMDS
char *telcmds[] = {
const char *telcmds[] = {
"EOF", "SUSP", "ABORT", "EOR",
"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
@ -126,7 +126,7 @@ extern char *telcmds[];
#define NTELOPTS (1+TELOPT_NEW_ENVIRON)
#ifdef TELOPTS
char *telopts[NTELOPTS+1] = {
const char *telopts[NTELOPTS+1] = {
"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
@ -226,7 +226,7 @@ char *telopts[NTELOPTS+1] = {
0
#ifdef SLC_NAMES
char *slc_names[] = {
const char *slc_names[] = {
SLC_NAMELIST
};
#else
@ -287,7 +287,7 @@ extern char *slc_names[];
#define AUTHTYPE_TEST 99
#ifdef AUTH_NAMES
char *authtype_names[] = {
const char *authtype_names[] = {
"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", NULL, "SRA",
0
};
@ -318,12 +318,12 @@ extern char *authtype_names[];
#define ENCTYPE_CNT 3
#ifdef ENCRYPT_NAMES
char *encrypt_names[] = {
const char *encrypt_names[] = {
"IS", "SUPPORT", "REPLY", "START", "END",
"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
0
};
char *enctype_names[] = {
const char *enctype_names[] = {
"ANY", "DES_CFB64", "DES_OFB64",
0
};

8
libexec/telnetd/sys_term.c
View File

@ -1098,14 +1098,14 @@ addarg(char **argv, const char *val)
}
for (cpp = argv; *cpp; cpp++)
;
if (cpp == &argv[(int)argv[-1]]) {
if (cpp == &argv[(long)argv[-1]]) {
--argv;
*argv = (char *)((int)(*argv) + 10);
argv = (char **)realloc(argv, sizeof(*argv)*((int)(*argv) + 2));
*argv = (char *)((long)(*argv) + 10);
argv = (char **)realloc(argv, sizeof(*argv)*((long)(*argv) + 2));
if (argv == NULL)
return(NULL);
argv++;
cpp = &argv[(int)argv[-1] - 10];
cpp = &argv[(long)argv[-1] - 10];
}
*cpp++ = strdup(val);
*cpp = 0;

2
usr.bin/telnet/commands.c
View File

@ -2397,7 +2397,7 @@ help(int argc, char *argv[])
printf("Commands may be abbreviated. Commands are:\n\n");
for (c = cmdtab; c->name; c++)
if (c->help) {
printf("%-*s\t%s\n", HELPINDENT, c->name,
printf("%-*s\t%s\n", (int)HELPINDENT, c->name,
c->help);
}
return 0;