summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-08-07 17:10:17 +0000
committerPaul Park <pjpark@mit.edu>1995-08-07 17:10:17 +0000
commit14b334f75a1bd74697cc1735f4e90cf6779dd69c (patch)
tree93455ec790e55b2705addc8e6289f8af7a7579a9 /src
parent4869f5a1dfd97e648240ec32ed1ee7ab94256bec (diff)
downloadkrb5-14b334f75a1bd74697cc1735f4e90cf6779dd69c.tar.gz
krb5-14b334f75a1bd74697cc1735f4e90cf6779dd69c.tar.xz
krb5-14b334f75a1bd74697cc1735f4e90cf6779dd69c.zip
libpty fixes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6434 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/appl/telnet/telnetd/ChangeLog7
-rw-r--r--src/appl/telnet/telnetd/configure.in5
-rw-r--r--src/appl/telnet/telnetd/sys_term.c4
3 files changed, 13 insertions, 3 deletions
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index ab15244b78..d5730ffc14 100644
--- 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 2c137b2db3..6875b59c85 100644
--- 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 9d537fd649..0adcb0470c 100644
--- 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.