From 75dd9c65fa2e4b80cc3637ab06e1839359f18dc7 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sun, 19 Nov 2000 10:01:27 +0000
Subject: [PATCH] Don't use sizeof() on a pointer when we really wanted to
 measure the length of the array.

Noticed by:	Christos Zoulas <christos@ZOULAS.COM>
Obtained from:	OpenBSD
---
 libexec/telnetd/ext.h      |  2 +-
 libexec/telnetd/sys_term.c | 10 +++-------
 libexec/telnetd/telnetd.c  |  1 -
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index bce0e2a71ae..98e74b7f7ee 100644
--- a/libexec/telnetd/ext.h
+++ b/libexec/telnetd/ext.h
@@ -87,7 +87,7 @@ extern char *unptyip;  /* pointer to remaining characters in buffer */
 #endif
 
 extern int	pty, net;
-extern char	*line;
+extern char	line[16];
 extern int	SYNCHing;		/* we are in TELNET SYNCH mode */
 
 #ifndef	P
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index 332dddc46b0..306449a6176 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -480,14 +480,10 @@ getnpty()
  *
  * Returns the file descriptor of the opened pty.
  */
-#ifndef	__GNUC__
-char *line = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-#else
-static char Xline[] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-char *line = Xline;
-#endif
 #ifdef	CRAY
-char *myline = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+char myline[16];
+#else
+char line[16];
 #endif	/* CRAY */
 
 	int
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 9158dfb1d80..7216cf72c14 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -805,7 +805,6 @@ doit(who)
 #else
 	for (;;) {
 		char *lp;
-		extern char *line, *getpty();
 
 		if ((lp = getpty()) == NULL)
 			fatal(net, "Out of ptys");