summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in2
-rw-r--r--pty.c11
3 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 079660174..e22c22b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
16 move checking of hostkey into own function. 16 move checking of hostkey into own function.
17 - [version.h] 17 - [version.h]
18 OpenSSH-1.2.1 18 OpenSSH-1.2.1
19 - Clean up broken includes in pty.c
19 20
2019991211 2119991211
21 - Fix compilation on systems with AFS. Reported by 22 - Fix compilation on systems with AFS. Reported by
diff --git a/Makefile.in b/Makefile.in
index f72867470..3c0891440 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ GNOME_LIBS=`gnome-config --libs gnome gnomeui`
26 26
27OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \ 27OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \
28 auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \ 28 auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \
29 bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o 29 bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o \
30 bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \ 30 bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \
31 compress.o crc32.o deattack.o helper.o helper.o hostfile.o \ 31 compress.o crc32.o deattack.o helper.o helper.o hostfile.o \
32 log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \ 32 log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \
diff --git a/pty.c b/pty.c
index f7ef19ca7..06b43bb84 100644
--- a/pty.c
+++ b/pty.c
@@ -14,16 +14,15 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$Id: pty.c,v 1.9 1999/12/13 23:47:16 damien Exp $"); 17RCSID("$Id: pty.c,v 1.10 1999/12/13 23:54:47 damien Exp $");
18
19#ifdef HAVE_UTIL_H
20# include <util.h>
21#endif /* HAVE_UTIL_H */
18 22
19#include <util.h>
20#include "pty.h" 23#include "pty.h"
21#include "ssh.h" 24#include "ssh.h"
22 25
23#ifdef HAVE_DEV_PTMX
24#include <sys/stropts.h>
25#endif /* HAVE_DEV_PTMX */
26
27/* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */ 26/* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
28#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY) 27#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
29#undef HAVE_DEV_PTMX 28#undef HAVE_DEV_PTMX