Merge 4.2p1 to the trunk.

1 files changed, 2 insertions, 2 deletions

diff --git a/sshpty.c b/sshpty.c
index 71b8daa0d..a3d0b8dfc 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -130,10 +130,10 @@ pty_make_controlling_tty(int *ttyfd, const char *tty)
         if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0)
                 error("ioctl(TIOCSCTTY): %.100s", strerror(errno));
 #endif /* TIOCSCTTY */
-#ifdef HAVE_NEWS4
+#ifdef NEED_SETPGRP
         if (setpgrp(0,0) < 0)
                 error("SETPGRP %s",strerror(errno));
-#endif /* HAVE_NEWS4 */
+#endif /* NEED_SETPGRP */
 #ifdef USE_VHANGUP
         old = signal(SIGHUP, SIG_IGN);
         vhangup();