diff options
| author | des <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
| commit | 14172c52f89fa504003826ed2e4e2c0ac246505d (patch) | |
| tree | bc48bd740145eea64393ed391fc1d972c83f991c /crypto/openssh/sshpty.c | |
| parent | 456370e53073cd38d0ddc4001283f1c131d1428e (diff) | |
| parent | 64c731d52472fb486558425128009691392e0bef (diff) | |
| download | FreeBSD-src-14172c52f89fa504003826ed2e4e2c0ac246505d.zip FreeBSD-src-14172c52f89fa504003826ed2e4e2c0ac246505d.tar.gz | |
Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removed
upstream) and a number of security fixes which we had already backported.
MFC after: 1 week
Diffstat (limited to 'crypto/openssh/sshpty.c')
| -rw-r--r-- | crypto/openssh/sshpty.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/crypto/openssh/sshpty.c b/crypto/openssh/sshpty.c index bbbc0fe..a2059b7 100644 --- a/crypto/openssh/sshpty.c +++ b/crypto/openssh/sshpty.c @@ -99,9 +99,6 @@ void pty_make_controlling_tty(int *ttyfd, const char *tty) { int fd; -#ifdef USE_VHANGUP - void *old; -#endif /* USE_VHANGUP */ #ifdef _UNICOS if (setsid() < 0) @@ -157,21 +154,11 @@ pty_make_controlling_tty(int *ttyfd, const char *tty) if (setpgrp(0,0) < 0) error("SETPGRP %s",strerror(errno)); #endif /* NEED_SETPGRP */ -#ifdef USE_VHANGUP - old = signal(SIGHUP, SIG_IGN); - vhangup(); - signal(SIGHUP, old); -#endif /* USE_VHANGUP */ fd = open(tty, O_RDWR); if (fd < 0) { error("%.100s: %.100s", tty, strerror(errno)); } else { -#ifdef USE_VHANGUP - close(*ttyfd); - *ttyfd = fd; -#else /* USE_VHANGUP */ close(fd); -#endif /* USE_VHANGUP */ } /* Verify that we now have a controlling tty. */ fd = open(_PATH_TTY, O_WRONLY); |
