Ticket #349: openvpn-2.3.2.patch

src/openvpn/options.c

@@ -2829 +2829 @@
     }
 
   o->push_continuation = 0;
+  o->push_option_types_found = 0;
 }
 
 #endif

src/openvpn/options.h

@@ -458 +458 @@
   bool client;
   bool pull; /* client pull of config options from server */
   int push_continuation;
+  int push_option_types_found;
   const char *auth_user_pass_file;
   struct options_pre_pull *pre_pull;
 

src/openvpn/push.c

@@ -202 +202 @@
     msg (D_PUSH_ERRORS, "WARNING: Received bad push/pull message: %s", sanitize_control_message(BSTR(buffer), &gc));
   else if (status == PUSH_MSG_REPLY || status == PUSH_MSG_CONTINUATION)
     {
+      c->options.push_option_types_found |= option_types_found;
+
       if (status == PUSH_MSG_REPLY)
-        do_up (c, true, option_types_found); /* delay bringing tun/tap up until --push parms received from remote */
+        do_up (c, true, c->options.push_option_types_found ); /* delay bringing tun/tap up until --push parms received from remote */
       event_timeout_clear (&c->c2.push_request_interval);
     }