summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-17 23:58:59 +1100
committerDamien Miller <djm@mindrot.org>2000-03-17 23:58:59 +1100
commite37ac5ae1797f955ba91c4665aa9f9b0fa3663e2 (patch)
treeaa8d08a426ac8ba57754aea5a1bc7bdf7d29b6a0
parent7684ee17ee96426970c00cb44d9d00b6611b9a57 (diff)
- Runtime error fix for HPUX from Otmar Stahl
<O.Stahl@lsw.uni-heidelberg.de>
-rw-r--r--ChangeLog2
-rw-r--r--pty.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba49585fe..e8f93ebbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
12 pedantic: signed vs. unsigned, void*-arithm, etc 12 pedantic: signed vs. unsigned, void*-arithm, etc
13 - [ssh.1 sshd.8] 13 - [ssh.1 sshd.8]
14 Various cleanups and standardizations. 14 Various cleanups and standardizations.
15 - Runtime error fix for HPUX from Otmar Stahl
16 <O.Stahl@lsw.uni-heidelberg.de>
15 17
1620000316 1820000316
17 - Fixed configure not passing LDFLAGS to Solaris. Report from David G. 19 - 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 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$Id: pty.c,v 1.16 2000/03/09 11:31:13 damien Exp $"); 17RCSID("$Id: pty.c,v 1.17 2000/03/17 12:58:59 damien Exp $");
18 18
19#ifdef HAVE_UTIL_H 19#ifdef HAVE_UTIL_H
20# include <util.h> 20# include <util.h>
@@ -123,8 +123,10 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
123 error("ioctl I_PUSH ptem: %.100s", strerror(errno)); 123 error("ioctl I_PUSH ptem: %.100s", strerror(errno));
124 if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0) 124 if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0)
125 error("ioctl I_PUSH ldterm: %.100s", strerror(errno)); 125 error("ioctl I_PUSH ldterm: %.100s", strerror(errno));
126#ifndef _HPUX_SOURCE
126 if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0) 127 if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0)
127 error("ioctl I_PUSH ttcompat: %.100s", strerror(errno)); 128 error("ioctl I_PUSH ttcompat: %.100s", strerror(errno));
129#endif
128 return 1; 130 return 1;
129#else /* HAVE_DEV_PTMX */ 131#else /* HAVE_DEV_PTMX */
130#ifdef HAVE_DEV_PTS_AND_PTC 132#ifdef HAVE_DEV_PTS_AND_PTC