Replace ChanType.sepfds with Channel.bidir_fd

This handles the case where a svrchansess has separate FDs
for nopty, but a single FD for pty mode.

The use of sepfds was also previously incorrect for X11 and
agent forwarding
This commit is contained in:
Matt Johnston
2021-10-11 15:42:14 +08:00
parent 8e6f73e879
commit f17400e738
9 changed files with 13 additions and 15 deletions

View File

@@ -47,7 +47,6 @@
static int new_agent_chan(struct Channel * channel);
const struct ChanType cli_chan_agent = {
0, /* sepfds */
"auth-agent@openssh.com",
new_agent_chan,
NULL,
@@ -94,6 +93,7 @@ static int new_agent_chan(struct Channel * channel) {
channel->readfd = fd;
channel->writefd = fd;
channel->bidir_fd = 1;
return 0;
}