diff -uNr telnet/Makefile telnet.obsd-cvs/Makefile

--- telnet/Makefile	Mon Jul 27 18:25:13 1998

+++ telnet.obsd-cvs/Makefile	Sat Mar 10 10:54:26 2001

@@ -36,22 +36,20 @@

 PROG=	telnet

-CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DSKEY -Dunix

-CFLAGS+=-DENV_HACK -D_USE_OLD_CURSES_

+CFLAGS+=-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY -Dunix

 CFLAGS+=-I${.CURDIR}/../../lib

-LDADD+=	-locurses -ltelnet

-DPADD=	${LIBOLDCURSES} ${LIBTELNET}

+LDADD+=	-lcurses -ltelnet

+DPADD=	${LIBCURSES} ${LIBTELNET

 SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \

 	terminal.c tn3270.c utilities.c

 .include <bsd.own.mk> # for KERBEROS

-.if (${KERBEROS} == "yes")

+.if (${KERBEROS:L} == "yes")

 CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4

 LDADD+= -lkrb -ldes

 DPADD+= ${LIBDES} ${LIBKRB}

 .endif

 .include <bsd.prog.mk>

-

diff -uNr telnet/commands.c telnet.obsd-cvs/commands.c

--- telnet/commands.c	Fri Apr  9 02:30:20 1999

+++ telnet.obsd-cvs/commands.c	Sat Mar 10 10:51:22 2001

@@ -1,4 +1,4 @@

-/*	$OpenBSD: commands.c,v 1.20 1999/01/04 07:55:05 art Exp $	*/

+/*	$OpenBSD: commands.c,v 1.34 2000/11/08 21:49:44 aaron Exp $	*/

 /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/

 /*

@@ -69,7 +69,7 @@

 	int status;

 	if(argc != 3) {

-		printf("%s sequence challenge\n", argv[0]);

+		printf("usage: %s sequence challenge\n", argv[0]);

 		return 0;

 	}

@@ -2175,17 +2175,19 @@

     int gotmachine = 0;

     int l1 = strlen(m1);

     int l2 = strlen(m2);

-    char m1save[64];

+    char m1save[MAXHOSTNAMELEN];

     if (skiprc)

 	return;

-    strcpy(m1save, m1);

+    strncpy(m1save, m1, sizeof(m1save));

     m1 = m1save;

     if (rcname[0] == 0) {

 	char *home = getenv("HOME");

+	if (home == NULL || *home == '\0')

+	    return;

 	snprintf (rcname, sizeof(rcname), "%s/.telnetrc",

 		  home ? home : "");

     }

@@ -2248,15 +2250,9 @@

     int

 tn(int argc, char *argv[])

 {

-    struct hostent *host = 0, *alias = 0;

-#if defined(AF_INET6)

-    struct sockaddr_in6 sin6;

-#endif

+    struct addrinfo hints, *res, *res0;

+    int error;

     struct sockaddr_in sin;

-    struct sockaddr_in ladr;

-    struct sockaddr *sa;

-    int sa_size;

-    struct servent *sp = 0;

     unsigned long temp;

 #if !defined(__linux__)

     extern char *inet_ntoa();

@@ -2266,15 +2262,18 @@

     int srlen;

 #endif

     char *cmd, *hostp = 0, *portp = 0, *user = 0, *aliasp = 0;

-    int family, port = 0;

-

+    int retry;

+#ifdef NI_WITHSCOPEID

+    const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;

+#else

+    const int niflags = NI_NUMERICHOST;

+#endif

+    

     /* clear the socket address prior to use */

     memset((char *)&sin, 0, sizeof(sin));

     if (connected) {

 	printf("?Already connected to %s\r\n", hostname);

-	seteuid(getuid());

-	setuid(getuid());

 	return 0;

     }

     if (argc < 2) {

@@ -2324,8 +2323,6 @@

 	}

     usage:

 	printf("usage: %s [-l user] [-a] host-name [port]\r\n", cmd);

-	seteuid(getuid());

-	setuid(getuid());

 	return 0;

     }

     if (hostp == 0)

@@ -2340,185 +2337,80 @@

 	temp = sourceroute(hostp, &srp, &srlen);

 	if (temp == 0) {

 	    herror(srp);

-	    seteuid(getuid());

-	    setuid(getuid());

 	    return 0;

 	} else if (temp == -1) {

 	    printf("Bad source route option: %s\r\n", hostp);

-	    seteuid(getuid());

-	    setuid(getuid());

 	    return 0;

 	} else {

 	    abort();

 	}

-    } else {

-#endif

-	memset (&sin, 0, sizeof(sin));

-#if defined(HAVE_INET_PTON) && defined(AF_INET6)

-	memset (&sin6, 0, sizeof(sin6));

-

-	if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) {

-	    sin6.sin6_family = family = AF_INET6;

-	    sa = (struct sockaddr *)&sin;;

-	    sa_size = sizeof(sin6);

-	    strcpy(_hostname, hostp);

-	    hostname =_hostname;

-	} else

-#endif

-	    if(inet_aton(hostp, &sin.sin_addr)){

-		sin.sin_family = family = AF_INET;

-		sa = (struct sockaddr *)&sin;

-		sa_size = sizeof(sin);

-		strcpy(_hostname, hostp);

-		hostname = _hostname;

-	    } else {

-#ifdef HAVE_GETHOSTBYNAME2

-		host = gethostbyname2(hostp, AF_INET6);

-		if(host == NULL)

-		    host = gethostbyname2(hostp, AF_INET);

-#else

-		host = gethostbyname(hostp);

-#endif

-		if (host) {

-		    strncpy(_hostname, host->h_name, sizeof(_hostname));

-		    family = host->h_addrtype;

-

-		    switch(family) {

-		    case AF_INET:

-			memset(&sin, 0, sizeof(sin));

-			sa_size = sizeof(sin);

-			sa = (struct sockaddr *)&sin;

-			sin.sin_family = family;

-

-			memcpy(&sin.sin_addr, *host->h_addr_list, sizeof(struct in_addr));

-			break;

-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)

-		    case AF_INET6:

-			memset(&sin6, 0, sizeof(sin6));

-			sa_size = sizeof(sin6);

-			sa = (struct sockaddr *)&sin;;

-			sin6.sin6_family = family;

-			memcpy(&sin6.sin6_addr, *host->h_addr_list, sizeof(struct in6_addr));

-			break;

-#endif

-		    default:

-			fprintf(stderr, "Bad address family: %d\n", family);

-			return 0;

-		    }

-		    

-		    _hostname[sizeof(_hostname)-1] = '\0';

-		    hostname = _hostname;

-		} else {

-		    herror(hostp);

-		    seteuid(getuid());

-		    setuid(getuid());

-		    return 0;

-		}

-	    }

-#if	defined(IP_OPTIONS) && defined(IPPROTO_IP)

-    }

+    } else

 #endif

-    if (portp) {

-	if (*portp == '-') {

-	    portp++;

-	    telnetport = 1;

-	} else

-	    telnetport = 0;

-	port = atoi(portp);

-	if (port == 0) {

-	    sp = getservbyname(portp, "tcp");

-	    if (sp)

-		port = sp->s_port;

-	    else {

-		printf("%s: bad port number\r\n", portp);

-		seteuid(getuid());

-		setuid(getuid());

-		return 0;

-	    }

-	} else {

-	    port = htons(port);

-	}

-    } else {

-	if (sp == 0) {

-	    sp = getservbyname("telnet", "tcp");

-	    if (sp == 0) {

-		fprintf(stderr, "telnet: tcp/telnet: unknown service\r\n");

-		seteuid(getuid());

-		setuid(getuid());

-		return 0;

-	    }

-	    port = sp->s_port;

+    {

+	hostname = hostp;

+	memset(&hints, 0, sizeof(hints));

+	hints.ai_family = PF_UNSPEC;

+	hints.ai_socktype = SOCK_STREAM;

+	hints.ai_flags = AI_CANONNAME;

+	if (portp == NULL) {

+		portp = "telnet";

+	} else if (*portp == '-') {

+		portp++;

+		telnetport = 1;

+	}

+	h_errno = 0;

+	error = getaddrinfo(hostp, portp, &hints, &res0);

+	if (error) {

+	    if (error == EAI_SERVICE)

+	        warnx("%s: bad port", portp);

+	    else

+		warnx("%s: %s", hostp, gai_strerror(error));

+	   if (h_errno)

+		herror(hostp);

+	   return 0;

 	}

-	telnetport = 1;

     }

-    switch(family) {

-    case AF_INET:

-	sin.sin_port = port;

-	printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));

-	break;

-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)

-    case AF_INET6: {

-#ifndef INET6_ADDRSTRLEN

-#define INET6_ADDRSTRLEN 46 

-#endif

-	char buf[INET6_ADDRSTRLEN];

-

-	sin6.sin6_port = port;

-#ifdef HAVE_INET_NTOP

-	printf("Trying %s...\r\n", inet_ntop(AF_INET6,

-					     &sin6.sin6_addr,

-					     buf,

-					     sizeof(buf)));

-#endif

-	break;

-    }

-#endif

-    default:

-	abort();

-    }

-

-    do {

-	net = socket(family, SOCK_STREAM, 0);

-	seteuid(getuid());

-	setuid(getuid());

-	if (net < 0) {

-	    perror("telnet: socket");

-	    return 0;

+    net = -1;

+    retry = 0;

+    for (res = res0; res; res = res->ai_next) {

+	if (1 /* retry */) {

+	    char hbuf[NI_MAXHOST];

+	    

+	    if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),

+	            NULL, 0, niflags) != 0) {

+		strcpy(hbuf, "(invalid)");

+	    }

+	    printf("Trying %s...\r\n", hbuf);

 	}

+	net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);

+	if (net < 0)

+	    continue;

+	    

 	if (aliasp) {

-	    memset ((caddr_t)&ladr, 0, sizeof (ladr));

-	    temp = inet_addr(aliasp);

-	    if (temp != INADDR_NONE) {

-	        ladr.sin_addr.s_addr = temp;

-	        ladr.sin_family = AF_INET;

-	        alias = gethostbyaddr((char *)&temp, sizeof(temp), AF_INET);

-	    } else {

-	        alias = gethostbyname(aliasp);

-	        if (alias) {

-		    ladr.sin_family = alias->h_addrtype;

-#if	defined(h_addr)		/* In 4.3, this is a #define */

-		    memmove((caddr_t)&ladr.sin_addr,

-			alias->h_addr_list[0], alias->h_length);

-#else	/* defined(h_addr) */

-		    memmove((caddr_t)&ladr.sin_addr, alias->h_addr,

-			alias->h_length);

-#endif	/* defined(h_addr) */

-	        } else {

-		    herror(aliasp);

-		    return 0;

-	        }

+	    struct addrinfo ahints, *ares;

+	    memset(&ahints, 0, sizeof(ahints));

+	    ahints.ai_family = PF_UNSPEC;

+	    ahints.ai_socktype = SOCK_STREAM;

+	    ahints.ai_flags = AI_PASSIVE;

+	    error = getaddrinfo(aliasp, "0", &ahints, &ares);

+	    if (error) {

+	        warn("%s: %s", aliasp, gai_strerror(error));

+	        close(net);

+	        freeaddrinfo(ares);

+	        continue;

 	    }

-            ladr.sin_port = htons(0);

-  

-            if (bind (net, (struct sockaddr *)&ladr, sizeof(ladr)) < 0) {

-                perror(aliasp);; 

+	    if (bind(net, ares->ai_addr, ares->ai_addrlen) < 0) {

+	        perror(aliasp);

                 (void) close(net);   /* dump descriptor */

-		return 0;

+		freeaddrinfo(ares);

+		continue;

             }

+	    freeaddrinfo(ares);

         }

  #if	defined(IP_OPTIONS) && defined(IPPROTO_IP)

-	if (srp && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)

+	if (srp && res->ai_family == AF_INET

+	 && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)

 		perror("setsockopt (IP_OPTIONS)");

 #endif

 #if	defined(IPPROTO_IP) && defined(IP_TOS)

@@ -2542,65 +2434,32 @@

 		perror("setsockopt (SO_DEBUG)");

 	}

-	if (connect(net, sa, sa_size) < 0) {

-	    int retry = 0;

-

-	    if (host && host->h_addr_list[1]) {

-		int oerrno = errno;

-	        retry = 1;

-

-		switch(family) {

-		case AF_INET :

-		    fprintf(stderr, "telnet: connect to address %s: ",

-			    inet_ntoa(sin.sin_addr));

-		    ++host->h_addr_list;

-		    memcpy(&sin.sin_addr, *host->h_addr_list, sizeof(struct in_addr));

-		    break;

-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)

-		case AF_INET6: {

-		    char buf[INET6_ADDRSTRLEN];

-

-		    fprintf(stderr, "telnet: connect to address %s: ",

-			    inet_ntop(AF_INET6, &sin6.sin6_addr, buf,

-				      sizeof(buf)));

-		    ++host->h_addr_list;

-		    memcpy(&sin6.sin6_addr, *host->h_addr_list, sizeof(struct in6_addr));

-		    break;

-		}

-#endif

-		default:

-		    abort();

-		}

-                   

-		errno = oerrno;

-		perror(NULL);

-

-		switch(family) {

-		case AF_INET :

-			printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));

-			break;

-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)

-		case AF_INET6: {

-		    printf("Trying %s...\r\n", inet_ntop(AF_INET6,

-					     &sin6.sin6_addr,

-					     buf,

-					     sizeof(buf)));

-		    break;

-		}

-#endif

-		}

-		

-		(void) NetClose(net);

-		continue;

+	if (connect(net, res->ai_addr, res->ai_addrlen) < 0) {

+	    char hbuf[NI_MAXHOST];

+	    

+	    if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),

+		    NULL, 0, NI_NUMERICHOST) != 0) {

+	        strcpy(hbuf, "(invalid)");

 	    }

-	    perror("telnet: Unable to connect to remote host");

-	    return 0;

+	    fprintf(stderr, "telnet: connect to address %s: %s\n", hbuf,

+	        strerror(errno));

+	

+	    close(net);

+	    net = -1;

+	    retry++;

+	    continue;

 	}

+

 	connected++;

 #if	defined(AUTHENTICATION) || defined(ENCRYPTION)

 	auth_encrypt_connect(connected);

 #endif	/* defined(AUTHENTICATION) */

-    } while (connected == 0);

+	break;

+    }

+    freeaddrinfo(res0);

+    if (net < 0) {

+        return 0;

+    }

     cmdrc(hostp, hostname);

     if (autologin && user == NULL) {

 	struct passwd *pw;

@@ -2652,6 +2511,9 @@

         encrypthelp[] = "turn on (off) encryption ('encrypt ?' for more)",

 #endif

 	zhelp[] =	"suspend telnet",

+#ifdef SKEY

+	skeyhelp[] =	"compute response to s/key challenge",

+#endif

 	shellhelp[] =	"invoke a subshell",

 	envhelp[] =	"change environment variables ('environ ?' for more)",

 	modestring[] = "try to enter line or character mode ('mode ?' for more)";

@@ -2690,7 +2552,7 @@

 	{ "environ",	envhelp,	env_cmd,	0 },

 	{ "?",		helphelp,	help,		0 },

 #if	defined(SKEY)

-	{ "skey",	NULL,		skey_calc,	0 },

+	{ "skey",	skeyhelp,	skey_calc,	0 },

 #endif		

 	{ 0,		0,		0,		0 }

 };

diff -uNr telnet/externs.h telnet.obsd-cvs/externs.h

--- telnet/externs.h	Mon Feb  8 22:56:11 1999

+++ telnet.obsd-cvs/externs.h	Sat Mar 10 10:54:35 2001

@@ -1,4 +1,4 @@

-/*	$OpenBSD: externs.h,v 1.4 1998/03/12 17:31:32 deraadt Exp $	*/

+/*	$OpenBSD: externs.h,v 1.5 1998/03/12 2001/01/22 11:03:38 fgsch Exp $	*/

 /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */

 /*

@@ -447,7 +447,7 @@

     *Ibackp,           /* Oldest byte of 3270 data */

     Ibuf[],            /* 3270 buffer */

     *Ifrontp,          /* Where next 3270 byte goes */

-    tline[],

+    tline[200],

     *transcom;         /* Transparent command */

 extern int

diff -uNr telnet/main.c telnet.obsd-cvs/main.c

--- telnet/main.c	Wed Apr  7 23:23:35 1999

+++ telnet.obsd-cvs/main.c	Sat Mar 10 09:59:35 2001

@@ -1,4 +1,4 @@

-/*	$OpenBSD: main.c,v 1.7 1998/05/15 03:16:38 art Exp $	*/

+/*	$OpenBSD: main.c,v 1.10 2001/01/21 22:46:37 aaron Exp $	*/

 /*	$NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $	*/

 /*

@@ -81,10 +81,10 @@

 	    prompt,

 #ifdef	AUTHENTICATION

 	    "[-8] [-E] [-K] [-L] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]",

-	    "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] [-b hostalias ]",

+	    "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] [-b hostalias ] ",

 #else

 	    "[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]",

-	    "\n\t[-n tracefile] [-b hostalias ]",

+	    "\n\t[-n tracefile] [-b hostalias ] ",

 #endif

 #if defined(TN3270) && defined(unix)

 # ifdef AUTHENTICATION

@@ -95,13 +95,11 @@

 #else

 	    "[-r] ",

 #endif

+	    "\n\r "

 #ifdef ENCRYPTION

-	    "[-x] [host-name [port]]"

-#else

-

-	    "[host-name [port]]"

+	    "[-x] " 

 #endif

-	);

+	    "[host-name [port]]");

 	exit(1);

 }

@@ -276,8 +274,8 @@

 			break;

 		case 't':

 #if defined(TN3270) && defined(unix)

+			(void)strncpy(tline, optarg, sizeof(tline));

 			transcom = tline;

-			(void)strcpy(transcom, optarg);

 #else

 			fprintf(stderr,

 			   "%s: Warning: -t ignored, no TN3270 support.\n",

diff -uNr telnet/sys_bsd.c telnet.obsd-cvs/sys_bsd.c

--- telnet/sys_bsd.c	Wed Apr  7 21:38:31 1999

+++ telnet.obsd-cvs/sys_bsd.c	Sat Mar 10 10:55:18 2001

@@ -1,4 +1,4 @@

-/*	$OpenBSD: sys_bsd.c,v 1.6 1998/12/28 11:13:51 deraadt Exp $	*/

+/*	$OpenBSD: sys_bsd.c,v 1.8 2000/10/10 15:41:10 millert Exp $	*/

 /*	$NetBSD: sys_bsd.c,v 1.11 1996/02/28 21:04:10 thorpej Exp $	*/

 /*

@@ -35,6 +35,7 @@

  */

 #include "telnet_locl.h"

+#include <err.h>

 /*

  * The following routines try to encapsulate what is system dependent

@@ -198,9 +199,10 @@

 TerminalFlushOutput(void)

 {

 #ifdef	TIOCFLUSH

-    (void) ioctl(fileno(stdout), TIOCFLUSH, (char *) 0);

+    int com = FWRITE;

+    (void) ioctl(fileno(stdout), TIOCFLUSH, (int *) &com);

 #else

-    (void) ioctl(fileno(stdout), TCFLSH, (char *) 0);

+    (void) ioctl(fileno(stdout), TCFLSH, (int *) 0);

 #endif

 }

diff -uNr telnet/telnet.c telnet.obsd-cvs/telnet.c

--- telnet/telnet.c	Wed Apr  7 23:22:14 1999

+++ telnet.obsd-cvs/telnet.c	Sat Mar 10 11:02:34 2001

@@ -1,4 +1,4 @@

-/*	$OpenBSD: telnet.c,v 1.6 1998/07/27 15:29:29 millert Exp $	*/

+/*	$OpenBSD: telnet.c,v 1.11 2000/11/10 15:33:13 provos millert Exp $	*/

 /*	$NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $	*/

 /*

@@ -35,6 +35,8 @@

  */

 #include "telnet_locl.h"

+#include <curses.h>

+#include <term.h>

 #define        strip(x) (eight ? (x) : ((x) & 0x7f))

@@ -523,10 +525,9 @@

 }

 /*

- * Given a buffer returned by tgetent(), this routine will turn

- * the pipe seperated list of names in the buffer into an array

- * of pointers to null terminated names.  We toss out any bad,

- * duplicate, or verbose names (names with spaces).

+ * This routine will turn a pipe seperated list of names in the buffer

+ * into an array of pointers to NUL terminated names.  We toss out any

+ * bad, duplicate, or verbose names (names with spaces).

  */

 int is_unique P((char *, char **, char **));

@@ -554,7 +555,7 @@

 	/*

 	 * Count up the number of names.

 	 */

-	for (n = 1, cp = buf; *cp && *cp != ':'; cp++) {

+	for (n = 1, cp = buf; *cp; cp++) {

 		if (*cp == '|')

 			n++;

 	}

@@ -659,25 +660,6 @@

 	return (1);

 }

-static char termbuf[1024];

-

-int telnet_setupterm	P((char *tname, int fd, int *errp)); /* XXX move elsewhere */

-	/*ARGSUSED*/

-	int

-telnet_setupterm(char *tname, int fd, int *errp)

-{

-	(void)fd;

-	if (tgetent(termbuf, tname) == 1) {

-		termbuf[1023] = '\0';

-		if (errp)

-			*errp = 1;

-		return(0);

-	}

-	if (errp)

-		*errp = 0;

-	return(-1);

-}

-

 int resettermname = 1;

 char *gettermname P((void));	/* XXX move elsewhere */

@@ -687,15 +669,15 @@

 	char *tname;

 	static char **tnamep = 0;

 	static char **next;

-	int err;

+	int errret;

 	if (resettermname) {

 		resettermname = 0;

 		if (tnamep && tnamep != unknown)

 			free(tnamep);

 		if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&

-				(telnet_setupterm(tname, 1, &err) == 0)) {

-			tnamep = mklist(termbuf, tname);

+				(setupterm(tname, 1, &errret) == 0)) {

+			tnamep = mklist(ttytype, tname);

 		} else {

 			if (tname && ((int)strlen(tname) <= 40)) {

 				unknown[0] = tname;

@@ -1482,10 +1464,15 @@

 	void

 env_opt_start(void)

 {

-	if (opt_reply)

-		opt_reply = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);

-	else

-		opt_reply = (unsigned char *)malloc(OPT_REPLY_SIZE);

+	unsigned char *p;

+	

+	if (opt_reply) {

+		p = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);

+		if (p == NULL)

+			free(opt_reply);

+	} else

+		p = (unsigned char *)malloc(OPT_REPLY_SIZE);

+	opt_reply = p;	

 	if (opt_reply == NULL) {

 /*@*/		printf("env_opt_start: malloc()/realloc() failed!!!\n");

 		opt_reply = opt_replyp = opt_replyend = NULL;

@@ -1532,9 +1519,13 @@

 				strlen((char *)ep) + 6 > opt_replyend)

 	{

 		int len;

+		unsigned char *p;

 		opt_replyend += OPT_REPLY_SIZE;

 		len = opt_replyend - opt_reply;

-		opt_reply = (unsigned char *)realloc(opt_reply, len);

+		p = (unsigned char *)realloc(opt_reply, len);

+		if (p == NULL)

+			free(opt_reply);

+		opt_reply = p;

 		if (opt_reply == NULL) {

 /*@*/			printf("env_opt_add: realloc() failed!!!\n");

 			opt_reply = opt_replyp = opt_replyend = NULL;

@@ -1945,7 +1936,7 @@

 				command(0, "z\n", 2);

 				continue;

 			}

-			if (sc == escape) {

+			if (sc == escape && escape != _POSIX_VDISABLE) {

 				command(0, (char *)tbp, tcc);

 				bol = 1;

 				count += tcc;

@@ -1962,7 +1953,7 @@

 		}

 		if ((sc == '\n') || (sc == '\r'))

 			bol = 1;

-	} else if (sc == escape) {

+	} else if (sc == escape && escape != _POSIX_VDISABLE) {

 	    /*

 	     * Double escape is a pass through of a single escape character.

 	     */

diff -uNr telnet/telnet_locl.h telnet.obsd-cvs/telnet_locl.h

--- telnet/telnet_locl.h	Thu Mar 12 06:57:44 1998

+++ telnet.obsd-cvs/telnet_locl.h	Sat Mar 10 11:12:37 2001

@@ -1,4 +1,4 @@

-/*	$OpenBSD: telnet_locl.h,v 1.1 1998/03/12 04:57:44 art Exp $	*/

+/*	$OpenBSD: telnet_locl.h,v 1.2 1999/12/11 09:08:09 itojun Exp $	*/

 /* $KTH: telnet_locl.h,v 1.13 1997/11/03 21:37:55 assar Exp $ */

 /*

@@ -86,7 +86,5 @@

 #include "defines.h"

 #include "types.h"

-#undef AF_INET6 /* XXX - it has not been tested and it doesn't exist yet */

-

 /* prototypes */

diff -uNr libtelnet/kerberos.c libtelnet.obsd-cvs/kerberos.c

--- libtelnet/kerberos.c	Mon Feb  8 23:38:17 1999

+++ libtelnet.obsd-cvs/kerberos.c	Sat Mar 10 11:11:03 2001

@@ -320,11 +320,10 @@

 	    char ts[MAXPATHLEN];

 	    struct passwd *pw = getpwnam(UserNameRequested);

-	    if(pw){

+	    if (pw) {

 		snprintf(ts, sizeof(ts),

-			 "%s%u",

-			 TKT_ROOT,

-			 (unsigned)pw->pw_uid);

+			"%s%u", TKT_ROOT, (unsigned)pw->pw_uid);

+		/* XXX allocation failure? */

 		setenv("KRBTKFILE", ts, 1);

 	    }

 	    Data(ap, KRB_ACCEPT, NULL, 0);

@@ -609,16 +608,26 @@

 {

     unsigned char *p = buf;

-    p += krb_put_nir(cred->service, cred->instance, cred->realm, p);

+    memcpy (p, cred->service, ANAME_SZ);

+    p += ANAME_SZ;

+    memcpy (p, cred->instance, INST_SZ);

+    p += INST_SZ;

+    memcpy (p, cred->realm, REALM_SZ);

+    p += REALM_SZ;

     memcpy(p, cred->session, 8);

     p += 8;

     *p++ = cred->lifetime;

     *p++ = cred->kvno;

-    p += krb_put_int(cred->ticket_st.length, p, 4);

+    p += krb_put_int(cred->ticket_st.length, p, 4, 4);

     memcpy(p, cred->ticket_st.dat, cred->ticket_st.length);

     p += cred->ticket_st.length;

-    p += krb_put_int(cred->issue_date, p, 4);

-    p += krb_put_nir(cred->pname, cred->pinst, NULL, p);

+    p += krb_put_int(cred->issue_date, p, 4, 4);

+    strncpy (cred->pname, p, ANAME_SZ);

+    cred->pname[ANAME_SZ - 1] = '\0';

+    p += ANAME_SZ;

+    strncpy (cred->pinst, p, INST_SZ);

+    cred->pinst[INST_SZ - 1] = '\0';

+    p += INST_SZ;

     return p - buf;

 }

@@ -627,7 +636,16 @@

 {

     unsigned char *p = buf;

-    p += krb_get_nir(p, cred->service, cred->instance, cred->realm);

+    strncpy (cred->service, p, ANAME_SZ);

+    cred->service[ANAME_SZ - 1] = '\0';

+    p += ANAME_SZ;

+    strncpy (cred->instance, p, INST_SZ);

+    cred->instance[INST_SZ - 1] = '\0';

+    p += INST_SZ;

+    strncpy (cred->realm, p, REALM_SZ);

+    cred->realm[REALM_SZ - 1] = '\0';

+    p += REALM_SZ;

+

     memcpy(cred->session, p, 8);

     p += 8;

     cred->lifetime = *p++;

@@ -636,7 +654,10 @@

     memcpy(cred->ticket_st.dat, p, cred->ticket_st.length);

     cred->ticket_st.mbz = 0;

     p += krb_get_int(p, (u_int32_t *)&cred->issue_date, 4, 0);

-    p += krb_get_nir(p, cred->pname, cred->pinst, NULL);

+    p += krb_get_nir(p, 

+		    cred->pname, sizeof(cred->pname),

+		    cred->pinst, sizeof(cred->pinst),

+		    NULL, 0);

     return 0;

 }

--- telnet/telnet.1	Thu Nov 12 01:01:46 1998

+++ telnet.obsd-cvs/telnet.1	Thu Nov  9 19:52:41 2000

@@ -1,4 +1,4 @@

-.\"	$OpenBSD: telnet.1,v 1.14 1998/11/11 23:01:46 aaron Exp $

+.\"	$OpenBSD: telnet.1,v 1.27 2000/11/09 17:52:41 aaron Exp $

 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $

 .\"

 .\" Copyright (c) 1983, 1990, 1993

@@ -36,45 +36,34 @@

 .\"

 .Dd February 3, 1994

 .Dt TELNET 1

-.Os BSD 4.2

+.Os

 .Sh NAME

 .Nm telnet

-.Nd user interface to the 

+.Nd user interface to the

 .Tn TELNET

 protocol

 .Sh SYNOPSIS

 .Nm telnet

-.Op Fl 8

-.Op Fl E

-.Op Fl F

-.Op Fl K

-.Op Fl L

-.Op Fl S Ar tos

+.Op Fl 8EFKLacdfrx

 .Op Fl X Ar authtype

-.Op Fl a

 .Op Fl b Ar hostalias

-.Op Fl c

-.Op Fl d

 .Op Fl e Ar escapechar

-.Op Fl f

 .Op Fl k Ar realm

 .Op Fl l Ar user

 .Op Fl n Ar tracefile

-.Op Fl r

-.Op Fl x

 .Oo

 .Ar host

 .Op Ar port

 .Oc

 .Sh DESCRIPTION

 The

-.Nm telnet

+.Nm

 command

-is used to communicate with another host using the 

+is used to communicate with another host using the

 .Tn TELNET

 protocol.

 If

-.Nm telnet

+.Nm

 is invoked without the

 .Ar host

 argument, it enters command mode,

@@ -85,11 +74,11 @@

 .Ic open

 command with those arguments.

 .Pp

-Options:

-.Bl -tag -width indent

+The options are as follows:

+.Bl -tag -width Ds

 .It Fl 8

-Specifies an 8-bit data path.  This causes an attempt to

-negotiate the

+Specifies an 8-bit data path.

+This causes an attempt to negotiate the

 .Dv TELNET BINARY

 option on both input and output.

 .It Fl E

@@ -103,18 +92,9 @@

 .It Fl K