From: Damien Miller <djm@mindrot.org>
Date: Fri, 17 Mar 2000 12:58:59 +0000 (+1100)
Subject:  - Runtime error fix for HPUX from Otmar Stahl
X-Git-Tag: V_1_2_3_PRE5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e37ac5ae1797f955ba91c4665aa9f9b0fa3663e2;p=thirdparty%2Fopenssh-portable.git

 - Runtime error fix for HPUX from Otmar Stahl
   <O.Stahl@lsw.uni-heidelberg.de>
---

diff --git a/ChangeLog b/ChangeLog
index ba49585fe..e8f93ebbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
      pedantic: signed vs. unsigned, void*-arithm, etc
    - [ssh.1 sshd.8]
      Various cleanups and standardizations.
+ - Runtime error fix for HPUX from Otmar Stahl 
+   <O.Stahl@lsw.uni-heidelberg.de>
 
 20000316
  - Fixed configure not passing LDFLAGS to Solaris. Report from David G. 
diff --git a/pty.c b/pty.c
index 03a754889..c34f1f5dc 100644
--- a/pty.c
+++ b/pty.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: pty.c,v 1.16 2000/03/09 11:31:13 damien Exp $");
+RCSID("$Id: pty.c,v 1.17 2000/03/17 12:58:59 damien Exp $");
 
 #ifdef HAVE_UTIL_H
 # include <util.h>
@@ -123,8 +123,10 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 		error("ioctl I_PUSH ptem: %.100s", strerror(errno));
 	if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0)
 		error("ioctl I_PUSH ldterm: %.100s", strerror(errno));
+#ifndef _HPUX_SOURCE
 	if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0)
 		error("ioctl I_PUSH ttcompat: %.100s", strerror(errno));
+#endif
 	return 1;
 #else /* HAVE_DEV_PTMX */
 #ifdef HAVE_DEV_PTS_AND_PTC