diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /sshpty.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'sshpty.c')
-rw-r--r-- | sshpty.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -130,10 +130,10 @@ pty_make_controlling_tty(int *ttyfd, const char *tty) | |||
130 | if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0) | 130 | if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0) |
131 | error("ioctl(TIOCSCTTY): %.100s", strerror(errno)); | 131 | error("ioctl(TIOCSCTTY): %.100s", strerror(errno)); |
132 | #endif /* TIOCSCTTY */ | 132 | #endif /* TIOCSCTTY */ |
133 | #ifdef HAVE_NEWS4 | 133 | #ifdef NEED_SETPGRP |
134 | if (setpgrp(0,0) < 0) | 134 | if (setpgrp(0,0) < 0) |
135 | error("SETPGRP %s",strerror(errno)); | 135 | error("SETPGRP %s",strerror(errno)); |
136 | #endif /* HAVE_NEWS4 */ | 136 | #endif /* NEED_SETPGRP */ |
137 | #ifdef USE_VHANGUP | 137 | #ifdef USE_VHANGUP |
138 | old = signal(SIGHUP, SIG_IGN); | 138 | old = signal(SIGHUP, SIG_IGN); |
139 | vhangup(); | 139 | vhangup(); |