From 3cc1b1bf9ce26585791f0e6a6a654877fc09ef9a Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 16 Dec 1998 06:04:29 +0000
Subject: [PATCH] Old stuff laying around:  Don't use a function called
 getstr(), that has nasty consequences when the system curses is ncurses as
 this conflicts with a ncurses funciton and causes recursion.

---
 lib/libtelnet/getent.c    |  2 +-
 libexec/telnetd/telnetd.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/libtelnet/getent.c b/lib/libtelnet/getent.c
index e87bf667cec9..0956a2abd381 100644
--- a/lib/libtelnet/getent.c
+++ b/lib/libtelnet/getent.c
@@ -58,7 +58,7 @@ char *cp, *name;
 #ifndef	SOLARIS
 /*ARGSUSED*/
 char *
-getstr(id, cpp)
+Getstr(id, cpp)
 char *id, **cpp;
 {
 # ifdef	HAS_CGETENT
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 7018fdc12dae..37564e343518 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)telnetd.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: telnetd.c,v 1.13 1997/12/03 07:16:05 charnier Exp $";
+	"$Id: telnetd.c,v 1.14 1998/04/26 06:51:36 phk Exp $";
 #endif /* not lint */
 
 #include "telnetd.h"
@@ -1091,13 +1091,13 @@ telnet(f, p, host)
 #endif
 
 	if (getent(defent, "default") == 1) {
-		char *getstr();
+		char *Getstr();
 		char *cp=defstrs;
 
-		HE = getstr("he", &cp);
-		HN = getstr("hn", &cp);
-		IM = getstr("im", &cp);
-		IF = getstr("if", &cp);
+		HE = Getstr("he", &cp);
+		HN = Getstr("hn", &cp);
+		IM = Getstr("im", &cp);
+		IF = Getstr("if", &cp);
 		if (HN && *HN)
 			(void) strcpy(host_name, HN);
 		if (IF && (if_fd = open(IF, O_RDONLY, 000)) != -1)