merge

http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.3p1-hpn11-none.diff
to trunk

diff --git a/openssh/channels.c b/openssh/channels.c
index eead4bd94f274ad177701b881b1ca1d5b9646c17..b7f36d0f52cb0b9419681142f7e60e9e6cae6995 100644 (file)
--- a/openssh/channels.c
+++ b/openssh/channels.c
@@ -749,7 +749,7 @@ static void
 channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset)
 {
        u_int limit = compat20 ? c->remote_window : packet_get_maxsize();
-
+       
        /* check buffer limits */
        limit = MIN(limit, (BUFFER_MAX_HPN_LEN - BUFFER_MAX_CHUNK - CHAN_RBUF));
 

diff --git a/openssh/scp.c b/openssh/scp.c
index 04d3b09b050bf84123e41d800ae3f5f2a1eb933f..92cab27ca0dc7c5c02980311a929ed01a6348fed 100644 (file)
--- a/openssh/scp.c
+++ b/openssh/scp.c
@@ -343,9 +343,6 @@ main(int argc, char **argv)
                case 'R':
                  addargs(&args, "-r%s", optarg);
                  break;
-               case 'w':
-                 addargs(&args, "-w%s", optarg);
-                 break;
                default:
                        usage();
                }

diff --git a/openssh/ssh.c b/openssh/ssh.c
index 0530c957fe4eee899484749f422bf95deaaefb8d..66d7cf34307ec4ea183907bf8e5a5c6be8714435 100644 (file)
--- a/openssh/ssh.c
+++ b/openssh/ssh.c
@@ -242,7 +242,6 @@ main(int ac, char **av)
 
        /* Parse command-line arguments. */
        host = NULL;
-
        /* need to set options.tcp_rcv_buf to 0 */
        options.tcp_rcv_buf = 0;
 
@@ -497,6 +496,9 @@ again:
                        break;
                case 'b':
                        options.bind_address = optarg;
+               case 'F':
+                       config = optarg;
+                       break;
                case 'r':
                        options.tcp_rcv_buf = atoi(optarg) * 1024;
                        break;
@@ -507,9 +509,6 @@ again:
                                options.none_switch = 1;
                        }
                        break;
-               case 'F':
-                       config = optarg;
-                       break;
 
                default:
                        usage();
@@ -1180,7 +1179,6 @@ ssh_session2_open(void)
            "session", SSH_CHANNEL_OPENING, in, out, err,
            window, packetmax, CHAN_EXTENDED_WRITE,
            "client-session", /*nonblock*/0);
-
        if (!tty_flag && (!(datafellows & SSH_BUG_LARGEWINDOW))) {
                c->dynamic_window = 1;
        }