summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--pty.c8
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bccc56508..5eb830c21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (bal) SCO Patch to add needed libraries for configure.in. Patch by 2 - (bal) SCO Patch to add needed libraries for configure.in. Patch by
3 Phillips Porch <root@theporch.com> 3 Phillips Porch <root@theporch.com>
4 - (bal) IRIX patch to adding Job Limits. Patch by Denis Parker <dcp@sgi.com> 4 - (bal) IRIX patch to adding Job Limits. Patch by Denis Parker <dcp@sgi.com>
5 - (stevesk) pty.c: HP-UX 10 and 11 don't define TIOCSCTTY. Add error() to
6 failed ioctl(TIOCSCTTY) call.
5 7
620001111 820001111
7 - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and 9 - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and
diff --git a/pty.c b/pty.c
index cdf1d1281..40bfd5290 100644
--- a/pty.c
+++ b/pty.c
@@ -238,12 +238,8 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
238 /* Make it our controlling tty. */ 238 /* Make it our controlling tty. */
239#ifdef TIOCSCTTY 239#ifdef TIOCSCTTY
240 debug("Setting controlling tty using TIOCSCTTY."); 240 debug("Setting controlling tty using TIOCSCTTY.");
241 /* 241 if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0)
242 * We ignore errors from this, because HPSUX defines TIOCSCTTY, but 242 error("ioctl(TIOCSCTTY): %.100s", strerror(errno));
243 * returns EINVAL with these arguments, and there is absolutely no
244 * documentation.
245 */
246 ioctl(*ttyfd, TIOCSCTTY, NULL);
247#endif /* TIOCSCTTY */ 243#endif /* TIOCSCTTY */
248#ifdef HAVE_NEWS4 244#ifdef HAVE_NEWS4
249 if (setpgrp(0,0) < 0) 245 if (setpgrp(0,0) < 0)