libpty fixes

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

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index ab15244b788e898d165b0b9b12ad366266bec58b..d5730ffc14bad3461268b8c535404b9001420baa 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,10 @@
+
+Mon Aug 7 13:08:39 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * configure.in - Add check for utmp.h.  Make check for utmpx.h define
+               additional symbol to work with libpty.h.
+       * sys_term.c - Fix syntax error and reinstate #ifdef LINEMODE deleted
+               by last checkin.
+
 Fri Aug  4 20:22:28 1995  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * sys_term.c (getptyslave): Select terminal settings more likely

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index 2c137b2db37cb2d6f583635a95bea578733feb6d..6875b59c8545f98caa5d8103352b09316b4a4701 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -28,7 +28,10 @@ AC_HEADER_CHECK(sys/ptyvar.h,AC_DEFINE(HAS_PTYVAR))
 AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS))
 AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H))
 AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
-AC_HEADER_CHECK(utmpx.h,AC_DEFINE(UTMPX))
+AC_HEADER_CHECK(utmpx.h,
+       AC_DEFINE(UTMPX)
+       AC_DEFINE(HAVE_UTMPX_H))
+AC_CHECK_HEADERS(utmp.h)
 AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
 AC_MSG_CHECKING([if setpgrp takes two arguments])
 dnl

diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 9d537fd649e68da2f120addd87723799bc089898..0adcb0470c27dc0c8d0829ad2897e21b929555b6 100644 (file)
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -494,9 +494,9 @@ char *myline = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
 #endif /* convex */
 
-static char
-int slavepid = 0;
+static pid_t slavepid = 0;
 
+#ifdef LINEMODE
 /*
  * tty_flowmode()      Find out if flow control is enabled or disabled.
  * tty_linemode()      Find out if linemode (external processing) is enabled.