merged hpn12v17 to trunk

diff --git a/openssh/readconf.c b/openssh/readconf.c
index a034b969a8cd2f4551ea71c6279b6ccf9b9cc969..a0adcb520caffa4cf59dfbe6e79f4c80710b39e8 100644 (file)
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -478,10 +478,21 @@ parse_flag:
        case oNoneEnabled:
                intptr = &options->none_enabled;
                goto parse_flag;
-
+ 
+       /* we check to see if the command comes from the */
+       /* command line or not. If it does then enable it */
+       /* otherwise fail. NONE should never be a default configuration */
        case oNoneSwitch:
-               intptr = &options->none_switch;
-               goto parse_flag;
+               if(strcmp(filename,"command-line")==0)
+               {               
+                   intptr = &options->none_switch;
+                   goto parse_flag;
+               } else {
+                   error("NoneSwitch is found in %.200s.\nYou may only use this configuration option from the command line", filename);
+                   error("Continuing...");
+                   debug("NoneSwitch directive found in %.200s.", filename);
+                   return 0;
+               }
 
        case oHPNDisabled:
                intptr = &options->hpn_disabled;
@@ -1254,11 +1265,11 @@ fill_default_options(Options * options)
        {
                if (options->hpn_buffer_size == 0)
                options->hpn_buffer_size = 1;
-               /*limit the buffer to 7MB*/
-                       if (options->hpn_buffer_size > 7168)
+               /*limit the buffer to 64MB*/
+                       if (options->hpn_buffer_size > 65536)
                {
-                       options->hpn_buffer_size = 7168;
-                       debug("User requested buffer larger than 7MB. Request reverted to 7MB");
+                       options->hpn_buffer_size = 65536;
+                       debug("User requested buffer larger than 64MB. Request reverted to 64MB");
                }
                options->hpn_buffer_size *=1024;
                debug("hpn_buffer_size set to %d", options->hpn_buffer_size);

diff --git a/openssh/version.h b/openssh/version.h
index ab5f1e8b9ff73a3135ea0245d16ac2e5dd79a329..97aa98ff66c8980489648d009ed9b1b8d2e54f72 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -23,6 +23,6 @@
 #define SSH_VERSION    "OpenSSH_4.6"
 
 #define SSH_PORTABLE   "p1"
-#define SSH_HPN         "-hpn12v16"
+#define SSH_HPN         "-hpn12v17"
 #define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
             NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION