diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-04-26 03:00:24 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-04-26 03:00:24 +0000 |
| commit | 2087de2f73b60d8e05fd0f5d649318dcb7d91d28 (patch) | |
| tree | 09315cb4d20620b9612a0838ee8926c034a2e490 /src/appl | |
| parent | e4c08a665fdf617958c2cbea947c2e57332d268d (diff) | |
| download | krb5-2087de2f73b60d8e05fd0f5d649318dcb7d91d28.tar.gz krb5-2087de2f73b60d8e05fd0f5d649318dcb7d91d28.tar.xz krb5-2087de2f73b60d8e05fd0f5d649318dcb7d91d28.zip | |
* configure.in, sys_term.c, telnetd.c : Have configure check for
sys/ptyvar.h and sac.h before .c files include it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5486 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/telnet/telnetd/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/configure.in | 2 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/sys_term.c | 4 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/telnetd.c | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index 4eb854f97..daf037730 100644 --- a/src/appl/telnet/telnetd/ChangeLog +++ b/src/appl/telnet/telnetd/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 25 22:53:20 1995 Chris Provenzano (proven@mit.edu) + + * configure.in, sys_term.c, telnetd.c : Have configure check for + sys/ptyvar.h and sac.h before .c files include it. + Sat Apr 22 00:52:01 1995 Theodore Y. Ts'o (tytso@dcl) * telnetd.c (main): Don't use krb5_override_default_realm, as it diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in index 014a0be38..7297914e9 100644 --- a/src/appl/telnet/telnetd/configure.in +++ b/src/appl/telnet/telnetd/configure.in @@ -35,6 +35,8 @@ AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h sys/tty.h) AC_HAVE_FUNCS(vhangup) AC_FUNC_CHECK(grantpt,AC_DEFINE(STREAMSPTY)) +AC_HEADER_CHECK(sac.h,AC_DEFINE(HAS_SAC)) +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)) diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c index efd898883..24a4ac10c 100644 --- a/src/appl/telnet/telnetd/sys_term.c +++ b/src/appl/telnet/telnetd/sys_term.c @@ -96,7 +96,9 @@ extern struct sysv sysv; #endif /* NEWINIT */ #ifdef STREAMSPTY -#include <sac.h> +#ifdef HAS_SAC +#include <sac.h> +#endif #include <sys/stropts.h> #endif diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c index 4c1ca21e0..ac3ff66cd 100644 --- a/src/appl/telnet/telnetd/telnetd.c +++ b/src/appl/telnet/telnetd/telnetd.c @@ -85,11 +85,14 @@ extern int utmp_len; int registerd_host_only = 0; #ifdef STREAMSPTY +#include <sys/stream.h> # include <stropts.h> # include <termio.h> /* make sure we don't get the bsd version */ # include "/usr/include/sys/tty.h" +#ifdef HAS_PTYVAR # include <sys/ptyvar.h> +#endif /* * Because of the way ptyibuf is used with streams messages, we need |