diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
| commit | d4ecd1085791f1e31b106a2546b08647fd6a2a17 (patch) | |
| tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/sshpty.c | |
| parent | f8a2a7f14a354d1231b54c452245604bf11bed62 (diff) | |
| download | src-d4ecd1085791f1e31b106a2546b08647fd6a2a17.tar.gz src-d4ecd1085791f1e31b106a2546b08647fd6a2a17.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=149753
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 efd1dfefa35d..36788c4d794a 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(); |