summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/pty.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-30 05:19:58 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-30 05:19:58 +0000
commitc167d8a3fabef2289593ea48c8ffc69a46a5f18d (patch)
tree6517694edb0e7bb5749d8acd4ba256c1ea0a336a /usr.bin/ssh/pty.c
parent7842c7f5dbdb242d9ec9b6f213d8b39a73c8f8ce (diff)
cull, cull, cull
Diffstat (limited to 'usr.bin/ssh/pty.c')
-rw-r--r--usr.bin/ssh/pty.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/usr.bin/ssh/pty.c b/usr.bin/ssh/pty.c
index b985eb1b3d6..d9b7968077c 100644
--- a/usr.bin/ssh/pty.c
+++ b/usr.bin/ssh/pty.c
@@ -14,7 +14,7 @@ Allocating a pseudo-terminal, and making it the controlling tty.
*/
#include "includes.h"
-RCSID("$Id: pty.c,v 1.3 1999/09/30 05:03:05 deraadt Exp $");
+RCSID("$Id: pty.c,v 1.4 1999/09/30 05:19:57 deraadt Exp $");
#include "pty.h"
#include "ssh.h"
@@ -24,12 +24,6 @@ RCSID("$Id: pty.c,v 1.3 1999/09/30 05:03:05 deraadt Exp $");
#undef HAVE_DEV_PTMX
#endif
-#ifdef HAVE_DEV_PTMX
-#include <sys/stream.h>
-#include <stropts.h>
-#include <sys/conf.h>
-#endif /* HAVE_DEV_PTMX */
-
#ifndef O_NOCTTY
#define O_NOCTTY 0
#endif
@@ -252,17 +246,6 @@ void pty_make_controlling_tty(int *ttyfd, const char *ttyname)
else
{
close(fd);
-#ifdef HAVE_VHANGUP
- signal(SIGHUP, SIG_IGN);
- vhangup();
- signal(SIGHUP, SIG_DFL);
- fd = open(ttyname, O_RDWR);
- if (fd == -1)
- error("pty_make_controlling_tty: reopening controlling tty after vhangup failed for %.100s",
- ttyname);
- close(*ttyfd);
- *ttyfd = fd;
-#endif /* HAVE_VHANGUP */
}
}