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

@@ -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;

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.

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.