Ticket #270: 8212.patch

init.c

@@ -2356 +2356 @@
 
 #ifdef USE_COMP
   /*
-   * Modify frame parameters if compression is enabled.
+   * Modify frame parameters if compression is compiled.
    * Should be called after frame_finalize_options.
    */
-  if (comp_enabled(&c->options.comp))
-    {
-      comp_add_to_extra_buffer (&c->c2.frame);
+  comp_add_to_extra_buffer (&c->c2.frame);
 #ifdef ENABLE_FRAGMENT
-      comp_add_to_extra_buffer (&c->c2.frame_fragment_omit); /* omit compression frame delta from final frame_fragment */
+  comp_add_to_extra_buffer (&c->c2.frame_fragment_omit); /* omit compression frame delta from final frame_fragment */
 #endif
-    }
 #endif /* USE_COMP */
 
 #ifdef ENABLE_FRAGMENT

version.m4

@@ -1 +1 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.21a])
+define(PRODUCT_VERSION,[2.1.21b])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])

openvpn.8

@@ -2261 +2261 @@
 
 The
 .B algorithm
-parameter may be "snappy", "lzo", "stub", or "no".  Snappy and LZO
+parameter may be "snappy", "lzo", or empty.  Snappy and LZO
 are different compression algorithms, with Snappy generally
 offering the best performance.
 
-"no" indicates that compression should be turned off, but the packet
-framing for compression is still enabled, allowing a different
-setting to be later pushed.
+If the
+.B algorithm
+parameter is empty, compression will be turned off, but the packet
+framing for compression will still be enabled, allowing a different
+setting to be pushed later.
 .\"*********************************************************
 .TP
 .B --comp-lzo [mode]

options.c

@@ -5627 +5627 @@
       VERIFY_PERMISSION (OPT_P_COMP);
       if (p[1])
         {
-          if (streq (p[1], "no"))
-            {
-              options->comp.alg = COMP_ALG_STUB;
-              options->comp.flags = COMP_F_SWAP;
-            }
           if (streq (p[1], "stub"))
             {
               options->comp.alg = COMP_ALG_STUB;