summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--pty.c7
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e5113cd2..bf6985967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
10 - (bal) auth2-skey.c - Checked in. Missing from portable tree. 10 - (bal) auth2-skey.c - Checked in. Missing from portable tree.
11 - (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and 11 - (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and
12 setsid() into more common files 12 setsid() into more common files
13 - (stevesk) pty.c: use __hpux to identify HP-UX.
13 14
1420001029 1520001029
15 - (stevesk) Fix typo in auth.c: USE_PAM not PAM 16 - (stevesk) Fix typo in auth.c: USE_PAM not PAM
diff --git a/pty.c b/pty.c
index 04004d20f..cdf1d1281 100644
--- a/pty.c
+++ b/pty.c
@@ -117,12 +117,15 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
117 return 0; 117 return 0;
118 } 118 }
119#ifndef HAVE_CYGWIN 119#ifndef HAVE_CYGWIN
120 /* Push the appropriate streams modules, as described in Solaris pts(7). */ 120 /*
121 * Push the appropriate streams modules, as described in Solaris pts(7).
122 * HP-UX pts(7) doesn't have ttcompat module.
123 */
121 if (ioctl(*ttyfd, I_PUSH, "ptem") < 0) 124 if (ioctl(*ttyfd, I_PUSH, "ptem") < 0)
122 error("ioctl I_PUSH ptem: %.100s", strerror(errno)); 125 error("ioctl I_PUSH ptem: %.100s", strerror(errno));
123 if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0) 126 if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0)
124 error("ioctl I_PUSH ldterm: %.100s", strerror(errno)); 127 error("ioctl I_PUSH ldterm: %.100s", strerror(errno));
125#ifndef _HPUX_SOURCE 128#ifndef __hpux
126 if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0) 129 if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0)
127 error("ioctl I_PUSH ttcompat: %.100s", strerror(errno)); 130 error("ioctl I_PUSH ttcompat: %.100s", strerror(errno));
128#endif 131#endif