From 022a6e806356135028a4dc3083305bbaba7c53c5 Mon Sep 17 00:00:00 2001
From: Unknown User d91-jda <d91-jda@nada.kth.se>
Date: Thu, 14 Sep 1995 15:43:49 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@105 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/acconfig.h          | 11 ++++++++++-
 appl/telnet/libtelnet/encrypt.c |  4 ++--
 appl/telnet/telnet/sys_bsd.c    |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/appl/telnet/acconfig.h b/appl/telnet/acconfig.h
index 267251424..e92594246 100644
--- a/appl/telnet/acconfig.h
+++ b/appl/telnet/acconfig.h
@@ -67,17 +67,26 @@
 @BOTTOM@
 
 /* set this to a sensible login */
+#ifndef LOGIN_PATH
 #define LOGIN_PATH "/usr/athena/bin/login"
+#endif
 
 
 #ifdef HAVE_TGETENT
 #define TERMCAP 1
 #endif
 
-#ifdef HAVE_TERMIOS_H
+#if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
 #define USE_TERMIO 1
+
+/* If this is not a POSIX boxen use SYSV, this may not work on CRAY
+ * se telnetd/desf.h */
+#ifndef HAVE_TERMIOS_H
+#define SYSV_TERMIO
 #endif
 
+#endif /* defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) */
+
 #ifndef HAVE_VFORK
 #define vfork fork
 #endif
diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
index 10464460e..9382b7320 100644
--- a/appl/telnet/libtelnet/encrypt.c
+++ b/appl/telnet/libtelnet/encrypt.c
@@ -255,7 +255,7 @@ EncryptDisable(type, mode)
 	if (isprefix(type, "help") || isprefix(type, "?")) {
 		printf("Usage: encrypt disable <type> [input|output]\n");
 		encrypt_list_types();
-	} else if ((ep = (Encryptions *)genget(type, encryptions,
+	} else if ((ep = (Encryptions *)genget(type, (char**)encryptions,
 						sizeof(Encryptions))) == 0) {
 		printf("%s: invalid encryption type\n", type);
 	} else if (Ambiguous(ep)) {
@@ -290,7 +290,7 @@ EncryptType(type, mode)
 	if (isprefix(type, "help") || isprefix(type, "?")) {
 		printf("Usage: encrypt type <type> [input|output]\n");
 		encrypt_list_types();
-	} else if ((ep = (Encryptions *)genget(type, encryptions,
+	} else if ((ep = (Encryptions *)genget(type, (char**)encryptions,
 						sizeof(Encryptions))) == 0) {
 		printf("%s: invalid encryption type\n", type);
 	} else if (Ambiguous(ep)) {
diff --git a/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c
index 66c5fdd55..3783ecada 100644
--- a/appl/telnet/telnet/sys_bsd.c
+++ b/appl/telnet/telnet/sys_bsd.c
@@ -676,9 +676,9 @@ TerminalNewMode(f)
 	(void) signal(SIGTSTP, SIG_DFL);
 # ifndef SOLARIS
 	(void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
-# else	SOLARIS
+# else
 	(void) sigrelse(SIGTSTP);
-# endif	SOLARIS
+# endif
 #endif	/* SIGTSTP */
 #ifndef USE_TERMIO
 	ltc = oltc;