summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1994-10-18 20:25:34 +0000
committerMark Eichin <eichin@mit.edu>1994-10-18 20:25:34 +0000
commit4115550cea9a98cf647be00c618cddf3e21dba97 (patch)
treeadae6f69ebdc42b810882758eb5c0e2baf21a93e /src
parent4ed7cbf784e0ddc8edc08d0462f1231e84922caf (diff)
* krlogind.c: use HAVE_STREAMS, fix TIOCPKT_* test
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/appl/bsd/ChangeLog1
-rw-r--r--src/appl/bsd/krlogind.c11
2 files changed, 8 insertions, 4 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index e351f5585..274da338b 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -3,6 +3,7 @@ Tue Oct 18 15:48:37 1994 Mark Eichin (eichin@cygnus.com)
* configure.in (HAVE_STREAMS): test for streams interface headers
in a way that fails on sunos but works on solaris.
* krlogin.c: use HAVE_STREAMS.
+ * krlogind.c: use HAVE_STREAMS, fix TIOCPKT_* test.
Tue Oct 4 17:14:38 1994 Theodore Y. Ts'o (tytso@dcl)
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 6b54bb17e..257ddbbdf 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -164,16 +164,19 @@ char copyright[] =
#include <sys/tty.h>
#endif
-#ifndef HAVE_SYS_PTYVAR_H
+#ifdef HAVE_STREAMS
+/* but solaris actually uses packet mode, so the real macros are needed too */
+#include <sys/ptyvar.h>
+#endif
+
+#ifndef TIOCPKT_NOSTOP
/* These values are over-the-wire protocol, *not* local values */
#define TIOCPKT_NOSTOP 0x10
#define TIOCPKT_DOSTOP 0x20
#define TIOCPKT_FLUSHWRITE 0x02
-#else
-/* but solaris actually uses packet mode, so the real macros are needed too */
-#include <sys/ptyvar.h>
#endif
+
#ifdef HAVE_SYS_FILIO_H
/* get FIONBIO from sys/filio.h, so what if it is a compatibility feature */
#include <sys/filio.h>