summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-08 08:53:52 +1100
committerDamien Miller <djm@mindrot.org>1999-12-08 08:53:52 +1100
commitfce1648681a20b99f569d4bfd9335bc4a956b119 (patch)
treefd2c365c734548c48e3f37973b8af715824ad5eb
parent05ec5c64251075aa40c74842a429546383d9b354 (diff)
- Compile fix for Solaris with /dev/ptmx from
David Agraz <dagraz@jahoopa.com>
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
-rw-r--r--pty.c13
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d7832d5..1b480950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+19991208
+ - Compile fix for Solaris with /dev/ptmx from
+ David Agraz <dagraz@jahoopa.com>
+
19991207
- sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com>
fixes compatability with 4.x and 5.x
diff --git a/configure.in b/configure.in
index 62e68317..f1027ef4 100644
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ AC_CHECK_LIB(dl, dlopen, , )
AC_CHECK_LIB(pam, pam_authenticate, , )
dnl Checks for header files.
-AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h pty.h shadow.h util.h utmp.h sys/select.h sys/time.h)
+AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h pty.h shadow.h util.h utmp.h sys/select.h sys/stropts.h sys/time.h)
dnl Checks for library functions.
AC_CHECK_FUNCS(arc4random mkdtemp openpty _getpty setenv setlogin setproctitle snprintf strlcat strlcpy vsnprintf)
diff --git a/pty.c b/pty.c
index 4f8fbd21..acd81c9b 100644
--- a/pty.c
+++ b/pty.c
@@ -14,20 +14,23 @@
*/
#include "includes.h"
-RCSID("$Id: pty.c,v 1.6 1999/12/07 04:38:32 damien Exp $");
+RCSID("$Id: pty.c,v 1.7 1999/12/07 21:53:52 damien Exp $");
#include "pty.h"
#include "ssh.h"
-#ifdef HAVE_PTY_H
-#include <pty.h>
-#endif /* HAVE_PTY_H */
-
/* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
#undef HAVE_DEV_PTMX
#endif
+#ifdef HAVE_PTY_H
+# include <pty.h>
+#endif
+#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
+# include <sys/stropts.h>
+#endif
+
#ifndef O_NOCTTY
#define O_NOCTTY 0
#endif