From 62641fb2129d2d8ea62142e5ede0ce36c8ac778b Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 11 Feb 1996 00:38:02 +0000
Subject: [PATCH] removed multiple defined variables

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@245 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/libtelnet/encrypt.c | 1 +
 appl/telnet/telnetd/ext.h       | 2 +-
 appl/telnet/telnetd/global.c    | 8 --------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
index d37e94d1c..43f75855a 100644
--- a/appl/telnet/libtelnet/encrypt.c
+++ b/appl/telnet/libtelnet/encrypt.c
@@ -79,6 +79,7 @@ RCSID("$Id$");
  */
 void	(*encrypt_output) P((unsigned char *, int));
 int	(*decrypt_input) P((int));
+char	*nclearto;
 
 int encrypt_debug_mode = 0;
 static int decrypt_mode = 0;
diff --git a/appl/telnet/telnetd/ext.h b/appl/telnet/telnetd/ext.h
index 6b296b157..246205fa4 100644
--- a/appl/telnet/telnetd/ext.h
+++ b/appl/telnet/telnetd/ext.h
@@ -67,7 +67,7 @@ extern char *new_login;
 
 extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
 
-char	*terminaltype;
+extern char	*terminaltype;
 
 /*
  * I/O data buffers, pointers, and counters.
diff --git a/appl/telnet/telnetd/global.c b/appl/telnet/telnetd/global.c
index 09206b1e3..341f9ff08 100644
--- a/appl/telnet/telnetd/global.c
+++ b/appl/telnet/telnetd/global.c
@@ -102,14 +102,6 @@ int	SYNCHing;		/* we are in TELNET SYNCH mode */
 # endif
 #endif
 
-
-#if	defined(ENCRYPTION)
-void	(*encrypt_output) P((unsigned char *, int));
-int	(*decrypt_input) P((int));
-char	*nclearto;
-#endif
-
-
 /*
  * The following are some clocks used to decide how to interpret
  * the relationship between various variables.