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 4d7832d59..1b4809505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
119991208
2 - Compile fix for Solaris with /dev/ptmx from
3 David Agraz <dagraz@jahoopa.com>
4
119991207 519991207
2 - sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com> 6 - sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com>
3 fixes compatability with 4.x and 5.x 7 fixes compatability with 4.x and 5.x
diff --git a/configure.in b/configure.in
index 62e68317e..f1027ef42 100644
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ AC_CHECK_LIB(dl, dlopen, , )
56AC_CHECK_LIB(pam, pam_authenticate, , ) 56AC_CHECK_LIB(pam, pam_authenticate, , )
57 57
58dnl Checks for header files. 58dnl Checks for header files.
59AC_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) 59AC_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)
60 60
61dnl Checks for library functions. 61dnl Checks for library functions.
62AC_CHECK_FUNCS(arc4random mkdtemp openpty _getpty setenv setlogin setproctitle snprintf strlcat strlcpy vsnprintf) 62AC_CHECK_FUNCS(arc4random mkdtemp openpty _getpty setenv setlogin setproctitle snprintf strlcat strlcpy vsnprintf)
diff --git a/pty.c b/pty.c
index 4f8fbd21b..acd81c9ba 100644
--- a/pty.c
+++ b/pty.c
@@ -14,20 +14,23 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$Id: pty.c,v 1.6 1999/12/07 04:38:32 damien Exp $"); 17RCSID("$Id: pty.c,v 1.7 1999/12/07 21:53:52 damien Exp $");
18 18
19#include "pty.h" 19#include "pty.h"
20#include "ssh.h" 20#include "ssh.h"
21 21
22#ifdef HAVE_PTY_H
23#include <pty.h>
24#endif /* HAVE_PTY_H */
25
26/* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */ 22/* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
27#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY) 23#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
28#undef HAVE_DEV_PTMX 24#undef HAVE_DEV_PTMX
29#endif 25#endif
30 26
27#ifdef HAVE_PTY_H
28# include <pty.h>
29#endif
30#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
31# include <sys/stropts.h>
32#endif
33
31#ifndef O_NOCTTY 34#ifndef O_NOCTTY
32#define O_NOCTTY 0 35#define O_NOCTTY 0
33#endif 36#endif