From: Mark Eichin <eichin@mit.edu>
Date: Thu, 29 Sep 1994 21:57:40 +0000 (+0000)
Subject: 	* krlogin.c (mode): ifdef VLNEXT instead of svr4 for ^V fixing.
X-Git-Tag: krb5-1.0-beta4.3~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd432091321ff0c68102127e01b91dd40448a782;p=krb5.git

	* krlogin.c (mode): ifdef VLNEXT instead of svr4 for ^V fixing.
	(doit): ditto.
	krlogin.c, configure.in: include sys/tty.h and sys/ttold.h only if
	they're both there.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4388 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 972964a9c..b1d4f0de9 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,7 +1,16 @@
+Thu Sep 29 17:55:57 1994  Mark Eichin  (eichin@tweedledumber.cygnus.com)
+
+	* krlogin.c (mode): ifdef VLNEXT instead of svr4 for ^V fixing.
+	(doit): ditto.
+	krlogin.c, configure.in: include sys/tty.h and sys/ttold.h only if
+	they're both there. 
+
+
 Wed Sep 28 20:57:24 1994  Mark Eichin  (eichin@tweedledumber.cygnus.com)
 
 	* configure.in (srand48): check for srand48, and if it exists,
 	substitute it for srandom (and lrand48 for random.)
+	(K4LIB): add libdes.a, needed for des_pcbc_encrypt.
 
 Wed Sep 28 14:36:29 1994  Mark Eichin  (eichin@rtl.cygnus.com)
 
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 431c8e033..3d28a02d7 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -39,7 +39,7 @@ AC_COMPILE_CHECK([sigset_t],
 [#include <signal.h>],
 [sigset_t x],
 AC_DEFINE(POSIX_SIGNALS)))
-AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h sys/label.h ttyent.h sys/ptyvar.h lastlog.h sys/select.h)
+AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h sys/label.h ttyent.h sys/ptyvar.h lastlog.h sys/select.h sys/tty.h sys/ttold.h)
 AC_REPLACE_FUNCS(getdtablesize)
 CHECK_DIRENT
 CHECK_FCNTL
diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 041ce72ed..2f309f496 100644
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -87,7 +87,8 @@ char copyright[] =
 /****** MWE *****/
 
 /****** MWE *****/
-#ifdef __svr4__
+/* formerly __svr4__ but that's not defined by suncc */
+#if defined(HAVE_SYS_TTY_H) && defined(HAVE_SYS_TTOLD_H)
 #include <sys/tty.h>
 #include <sys/ttold.h>
 #ifdef HAVE_SYS_PTYVAR_H
@@ -707,7 +708,8 @@ doit(oldmask)
 {
 #ifdef POSIX_TERMIOS
 	(void) tcgetattr(0, &deftty);
-#ifdef __svr4__
+/* was __svr4__ */
+#ifdef VLNEXT
 	/* there's a POSIX way of doing this, but do we need it general? */
 	deftty.c_cc[VLNEXT] = 0;
 #endif
@@ -1334,7 +1336,8 @@ mode(f)
 		break;
 	case 1:
 		(void) tcgetattr(0, &newtty);
-#ifdef __svr4__
+/* was __svr4__ */
+#ifdef VLNEXT
 	/* there's a POSIX way of doing this, but do we need it general? */
 		newtty.c_cc[VLNEXT] = 0;
 #endif