From 4a63284e80fa51bf6ec096b61397c5566a5a14f5 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Wed, 25 Sep 2002 07:53:29 +0000
Subject: [PATCH] Unifdef(1) the crypto telnet sources.

---
 usr.bin/telnet/commands.c  | 2 +-
 usr.bin/telnet/main.c      | 4 ----
 usr.bin/telnet/network.c   | 1 +
 usr.bin/telnet/sys_bsd.c   | 6 +++---
 usr.bin/telnet/terminal.c  | 2 ++
 usr.bin/telnet/utilities.c | 1 +
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index d5eda3196795..59adb16e4d32 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -75,7 +75,7 @@ static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 
 #ifndef       MAXHOSTNAMELEN
 #define       MAXHOSTNAMELEN 256
-#endif        MAXHOSTNAMELEN
+#endif
 
 typedef int (*intrtn_t)(int, char **);
 
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index 6276fdd7dead..676f13f8ae1a 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -55,10 +55,6 @@ static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #define OPTS_FORWARD_CREDS	0x00000002
 #define OPTS_FORWARDABLE_CREDS	0x00000001
 
-#if 0
-#define FORWARD
-#endif
-
 #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 char *ipsec_policy_in = NULL;
 char *ipsec_policy_out = NULL;
diff --git a/usr.bin/telnet/network.c b/usr.bin/telnet/network.c
index 554db4f24d98..b93f82519d2f 100644
--- a/usr.bin/telnet/network.c
+++ b/usr.bin/telnet/network.c
@@ -44,6 +44,7 @@ static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #include <sys/time.h>
 
 #include <errno.h>
+#include <stdlib.h>
 
 #include <arpa/telnet.h>
 #include <unistd.h>
diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c
index fca026df5738..5d931bf8b874 100644
--- a/usr.bin/telnet/sys_bsd.c
+++ b/usr.bin/telnet/sys_bsd.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
  * (at least between 4.x and dos) which is used in telnet.c.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
@@ -654,9 +654,9 @@ TerminalNewMode(int f)
 	(void) signal(SIGTSTP, SIG_DFL);
 # ifndef SOLARIS
 	(void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
-# else	SOLARIS
+# else	/* SOLARIS */
 	(void) sigrelse(SIGTSTP);
-# endif	SOLARIS
+# endif	/* SOLARIS */
 #endif	/* SIGTSTP */
 #ifndef USE_TERMIO
 	ltc = oltc;
diff --git a/usr.bin/telnet/terminal.c b/usr.bin/telnet/terminal.c
index 14eb0ff1c598..b6e4a4755c56 100644
--- a/usr.bin/telnet/terminal.c
+++ b/usr.bin/telnet/terminal.c
@@ -42,6 +42,8 @@ static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #include <arpa/telnet.h>
 #include <sys/types.h>
 
+#include <stdlib.h>
+
 #include "ring.h"
 
 #include "externs.h"
diff --git a/usr.bin/telnet/utilities.c b/usr.bin/telnet/utilities.c
index 8ea888e54461..4a51966e4691 100644
--- a/usr.bin/telnet/utilities.c
+++ b/usr.bin/telnet/utilities.c
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "general.h"