http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.1p1-hpn13v5.diff.gz committe...

[gssapi-openssh.git] / openssh / session.c

diff --git a/openssh/session.c b/openssh/session.c
index 93babf95701a723398e098d8965c1579ac269dac..3b40fa322a70f27987b6e7d3190804dc7665ccb8 100644 (file)
--- a/openssh/session.c
+++ b/openssh/session.c
@@ -224,6 +224,7 @@ auth_input_request_forwarding(struct passwd * pw)
        }
 
        /* Allocate a channel for the authentication agent socket. */
+       /* this shouldn't matter if its hpn or not - cjr */
        nc = channel_new("auth socket",
            SSH_CHANNEL_AUTH_SOCKET, sock, sock, -1,
            CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,
@@ -2295,10 +2296,16 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr, int is_tty)
         */
        if (s->chanid == -1)
                fatal("no channel for session %d", s->self);
+       if (options.hpn_disabled)
        channel_set_fds(s->chanid,
            fdout, fdin, fderr,
            fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
            1, is_tty, CHAN_SES_WINDOW_DEFAULT);
+       else 
+               channel_set_fds(s->chanid,
+                   fdout, fdin, fderr,
+                   fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
+                   1, is_tty, options.hpn_buffer_size);
 }
 
 /*