diff options
| author | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
| commit | 88c7c9558ba88abbcc00dcd9133b4996eff74033 (patch) | |
| tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/sshpty.c | |
| parent | 1ea3628aba1278f27d571a26380b4e91155d3973 (diff) | |
| download | FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.zip FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/sshpty.c')
| -rw-r--r-- | crypto/openssh/sshpty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/sshpty.c b/crypto/openssh/sshpty.c index efd1dfe..36788c4 100644 --- a/crypto/openssh/sshpty.c +++ b/crypto/openssh/sshpty.c @@ -128,10 +128,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(); |
