Merge branch 'obsd-master'

Conflicts:
	server.c
This commit is contained in:
Thomas Adam
2015-10-31 23:56:35 +00:00
10 changed files with 25 additions and 55 deletions

View File

@@ -1191,7 +1191,6 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
proc_send(c->peer, MSG_STDIN, -1, NULL, 0);
c->tty.fd = -1;
c->tty.log_fd = -1;
close(c->fd);
c->fd = -1;