openssh unix dev - Dec 1999 - openssh-1.2pre16 patch to pty.c for Solaris 2.6

Greetings,

While attempting to build openssh for Solaris 2.6, I ran into a minor
problem that should probably be corrected in the next release of
openssh. The file pty.c does not #include <stropts.h> to define I_PUSH
even though I_PUSH is used when HAVE_DEV_PTMX is defined.

Platform:
 SunOS test01 5.6 Generic_105181-16 sun4u sparc SUNW,Ultra-60

Using:
 zlib 1.1.3 http://www.cdrom.com/pub/infozip/zlib/zlib-1.1.3.tar.gz

 rsaref2.0 (plus patch from bugtraq digest 30-Nov-1999)
 ftp://ftp.funet.fi/pub/unix/security/login/ssh/rsaref2.tar.gz

 openssl 0.9.4 ftp://ftp.openssl.org/source/openssl-0.9.4.tar.gz

 egd 0.6 ftp://ftp.lothar.com/linux/egd-0.6.tar.gz

 openssh 1.2pre16 http://violet.ibs.com.au/openssh/files/openssh-1.2pre16.tar.gz

Configured with:
 ./configure --prefix=/usr/local \
             --sysconfdir=/etc/ssh \
             --with-tcp-wrapers \
             --with-egd-pool=/var/random/entropy

Problem:
 # using $Id: pty.c,v 1.9 1999/12/06 12:10:12 deraadt Exp $
 gcc -g -O2 -Wall -I/usr/local/ssl/include -DETCDIR=\"/etc/ssh\" \
     -DSSH_PROGRAM=\"/usr/local/bin/ssh\" \
     -DSSH_ASKPASS_DEFAULT=\"/usr/local/libexec/ssh/ssh-askpass\" \
     -DHAVE_CONFIG_H   -c pty.c -o pty.o
 pty.c: In function `pty_allocate':
 pty.c:115: `I_PUSH' undeclared (first use in this function)
 pty.c:115: (Each undeclared identifier is reported only once
 pty.c:115: for each function it appears in.)
 make: *** [pty.o] Error 1

Possible Patch:

Index: pty.c
--- pty.c~	1999/12/09 09:31:41
+++ pty.c	1999/12/09 16:41:46
@@ -27,6 +27,12 @@
 #if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
 #undef HAVE_DEV_PTMX
 #endif
+
+#ifdef HAVE_DEV_PTMX
+#ifndef I_PUSH
+#include <stropts.h>
+#endif /* I_PUSH */
+#endif /* HAVE_DEV_PTMX */
 
 #ifndef O_NOCTTY
 #define O_NOCTTY 0

        Enjoy!
        -- Mark

On Thu, 9 Dec 1999, Mark D. Baushke wrote:
> Greetings,
> 
> While attempting to build openssh for Solaris 2.6, I ran into a minor
> problem that should probably be corrected in the next release of
> openssh. The file pty.c does not #include <stropts.h> to define
I_PUSH
> even though I_PUSH is used when HAVE_DEV_PTMX is defined.
Should be fixed in 1.2pre17

Thanks,
Damien Miller

--
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)