* configure.in: undo streams test. It turns out that we want sunos

	to *fail* that test, since it doesn't have a streams PTEM module
	anyhow.
	* krlogind.c: don't include sys/tty.h and sys/ptyvar.h if we don't
	HAVE_STREAMS already.
	* krlogin.c: do the same thing.

most of the files in appl/bsd should probably include one common
"system headers" include, since they duplicate so much (and not
consistently at that.) krlogind now works on SunOS 4.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index d758ed45e0d8c25a8f50a3b66600d2aaf31656a9..e4977cad61d53a673eadaffc6fb988f99665a286 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 18 01:07:56 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in: undo streams test. It turns out that we want sunos
+       to *fail* that test, since it doesn't have a streams PTEM module
+       anyhow.
+       * krlogind.c: don't include sys/tty.h and sys/ptyvar.h if we don't
+       HAVE_STREAMS already.
+       * krlogin.c: do the same thing.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index f73c56bcbe41295437f3032e34169ecd08b6edf7..53c8760860f38bb53ba61cd79d6dabd8031f2cda 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -69,8 +69,7 @@ dnl
 AC_MSG_CHECKING([streams interface])
 AC_CACHE_VAL(krb5_cv_has_streams,
 [AC_TRY_COMPILE(
-[#include <sys/types.h>
-#include <sys/stream.h>
+[#include <sys/stream.h>
 #include <sys/stropts.h>], [],
 krb5_cv_has_streams=yes, krb5_cv_has_streams=no)])
 AC_MSG_RESULT($krb5_cv_has_streams)

diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 90f5b9ec317ff7a7e0d73b47897ec70ae3342b40..38fa24344565c07682ac42c9ae301d3783f9f064 100644 (file)
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -91,12 +91,14 @@ char copyright[] =
 #include <sys/ptem.h>
 #endif
 
+#ifdef HAVE_STREAMS
 #ifdef HAVE_SYS_PTYVAR_H
 #include <sys/tty.h>
 #include <sys/ttold.h>
 /* solaris actually uses packet mode, so the real macros are needed too */
 #include <sys/ptyvar.h>
 #endif
+#endif
 
 /* how do we tell apart irix 5 and irix 4? */
 #if defined(__sgi) && defined(__mips)

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 88bbc8cc6baaab614df1790c390a9ad8bafae0fd..4b1a00b995a344dd8202b45eb41748d6aadd7377 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -161,6 +161,8 @@ char copyright[] =
 #include <sys/param.h>
 #include <utmp.h>
 
+#ifdef HAVE_STREAMS
+/* krlogin doesn't test sys/tty... */
 #ifdef HAVE_SYS_TTY_H
 #include <sys/tty.h>
 #endif
@@ -169,6 +171,7 @@ char copyright[] =
 /* Solaris actually uses packet mode, so the real macros are needed too */
 #include <sys/ptyvar.h>
 #endif
+#endif
 
 
 #ifndef TIOCPKT_NOSTOP