- Compile fix for Solaris with /dev/ptmx from

   David Agraz <dagraz@jahoopa.com>

diff --git a/ChangeLog b/ChangeLog
index 4d7832d592a82a18fa7593e8e4c98b62c0026349..1b4809505af636775b1e3a4681f74c6bc2dd08f8 100644 (file)
--- 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 62e68317e5b3978a76df2b794a90f91e0db55f03..f1027ef42d29f23c0432d398279288dfef8079ce 100644 (file)
--- 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 455d441614c5fed3d9a556ff950caa1d7af3d696..27fcdbe17f8f273851773be2df5db8e9d3e8c91e 100644 (file)
--- a/pty.c
+++ b/pty.c
@@ -19,15 +19,18 @@ RCSID("$Id$");
 #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