diff options
| author | Mark Eichin <eichin@mit.edu> | 1995-01-18 06:11:31 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1995-01-18 06:11:31 +0000 |
| commit | ceb911f2784ee4d81c336c5ea1c11b54fbdd6554 (patch) | |
| tree | be2052a4dee4d370b2c4ad00ab1659af77fe8573 | |
| parent | 8e01cf048bc8574479ca766b97b7ddbdb1f90926 (diff) | |
| download | krb5-ceb911f2784ee4d81c336c5ea1c11b54fbdd6554.tar.gz krb5-ceb911f2784ee4d81c336c5ea1c11b54fbdd6554.tar.xz krb5-ceb911f2784ee4d81c336c5ea1c11b54fbdd6554.zip | |
* 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
| -rw-r--r-- | src/appl/bsd/ChangeLog | 9 | ||||
| -rw-r--r-- | src/appl/bsd/configure.in | 3 | ||||
| -rw-r--r-- | src/appl/bsd/krlogin.c | 2 | ||||
| -rw-r--r-- | src/appl/bsd/krlogind.c | 3 |
4 files changed, 15 insertions, 2 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index d758ed45e0..e4977cad61 100644 --- 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 f73c56bcbe..53c8760860 100644 --- 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 90f5b9ec31..38fa243445 100644 --- 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 88bbc8cc6b..4b1a00b995 100644 --- 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 |