@@ -398,6 +398,19 @@ buf_chomp (struct buffer *buf)

   buf_null_terminate (buf);

 }

+const char *

+skip_leading_whitespace (const char *str)

+{

+  while (*str)

+    {

+      const char c = *str;

+      if (!(c == ' ' || c == '\t'))

+	break;

+      ++str;

+    }

+  return str;

+}

+

 /*

  * like buf_null_terminate, but operate on strings

  */

@@ -475,6 +488,42 @@ string_clear (char *str)

 }

 /*

+ * Return the length of a string array

+ */

+int

+string_array_len (const char **array)

+{

+  int i = 0;

+  if (array)

+    {

+      while (array[i])

+        ++i;

+    }

+  return i;

+}

+

+char *

+print_argv (const char **p, struct gc_arena *gc, const unsigned int flags)

+{

+  struct buffer out = alloc_buf_gc (256, gc);

+  int i = 0;

+  for (;;)

+    {

+      const char *cp = *p++;

+      if (!cp)

+	break;

+      if (i)

+	buf_printf (&out, " ");

+      if (flags & PA_BRACKET)

+	buf_printf (&out, "[%s]", cp);

+      else

+	buf_printf (&out, "%s", cp);

+      ++i;

+    }

+  return BSTR (&out);

+}

+

+/*

  * Allocate a string inside a buffer

  */

 struct buffer

@@ -84,6 +84,10 @@ void free_buf (struct buffer *buf);

 bool buf_assign (struct buffer *dest, const struct buffer *src);

 void string_clear (char *str);

+int string_array_len (const char **array);

+

+#define PA_BRACKET (1<<0)

+char *print_argv (const char **p, struct gc_arena *gc, const unsigned int flags);

 /* for dmalloc debugging */

@@ -220,6 +224,7 @@ void buf_rmtail (struct buffer *buf, uint8_t remove);

  * non-buffer string functions

  */

 void chomp (char *str);

+const char *skip_leading_whitespace (const char *str);

 void string_null_terminate (char *str, int len, int capacity);

 /*

@@ -1368,6 +1368,73 @@ make_arg_array (const char *first, const char *parms, struct gc_arena *gc)

   return (const char **)ret;

 }

+#if ENABLE_INLINE_FILES

+static const char **

+make_inline_array (const char *str, struct gc_arena *gc)

+{

+  char line[OPTION_LINE_SIZE];

+  struct buffer buf;

+  int len = 0;

+  char **ret = NULL;

+  int i = 0;

+

+  buf_set_read (&buf, str, strlen (str));

+  while (buf_parse (&buf, '\n', line, sizeof (line)))

+    ++len;

+

+  /* alloc return array */

+  ALLOC_ARRAY_CLEAR_GC (ret, char *, len + 1, gc);

+

+  buf_set_read (&buf, str, strlen(str));

+  while (buf_parse (&buf, '\n', line, sizeof (line)))

+    {

+      chomp (line);

+      ASSERT (i < len);

+      ret[i] = string_alloc (skip_leading_whitespace (line), gc);

+      ++i;

+    }  

+  ASSERT (i <= len);

+  ret[i] = NULL;

+  return (const char **)ret;

+}

+#endif

+

+static const char **

+make_arg_copy (char **p, struct gc_arena *gc)

+{

+  char **ret = NULL;

+  const int len = string_array_len ((const char **)p);

+  const int max_parms = len + 1;

+  int i;

+

+  /* alloc return array */

+  ALLOC_ARRAY_CLEAR_GC (ret, char *, max_parms, gc);

+

+  for (i = 0; i < len; ++i)

+    ret[i] = p[i];

+

+  return (const char **)ret;

+}

+

+const char **

+make_extended_arg_array (char **p, struct gc_arena *gc)

+{

+  const int argc = string_array_len ((const char **)p);

+#if ENABLE_INLINE_FILES

+  if (!strcmp (p[0], INLINE_FILE_TAG) && argc == 2)

+    return make_inline_array (p[1], gc);

+  else

+#endif

+  if (argc == 0)

+    return make_arg_array (NULL, NULL, gc);

+  else if (argc == 1)

+    return make_arg_array (p[0], NULL, gc);

+  else if (argc == 2)

+    return make_arg_array (p[0], p[1], gc);

+  else

+    return make_arg_copy (p, gc);

+}

+

 void

 openvpn_sleep (const int n)

 {

@@ -180,6 +180,7 @@ void env_set_remove_from_environment (const struct env_set *es);

 const char **make_env_array (const struct env_set *es, struct gc_arena *gc);

 const char **make_arg_array (const char *first, const char *parms, struct gc_arena *gc);

+const char **make_extended_arg_array (char **p, struct gc_arena *gc);

 /* convert netmasks for iproute2 */

 int count_netmask_bits(const char *);

@@ -2718,9 +2718,8 @@ check_inline_file_via_buf (struct buffer *multiline, char *p[], struct gc_arena

 #endif

-static int

+static void

 add_option (struct options *options,

-	    int i,

 	    char *p[],

 	    const char *file,

 	    int line,

@@ -2764,7 +2763,7 @@ read_config_file (struct options *options,

 #if ENABLE_INLINE_FILES

 		  check_inline_file_via_fp (fp, p, &options->gc);

 #endif

-		  add_option (options, 0, p, file, line_num, level, msglevel, permission_mask, option_types_found, es);

+		  add_option (options, p, file, line_num, level, msglevel, permission_mask, option_types_found, es);

 		}

 	    }

 	  fclose (fp);

@@ -2808,7 +2807,7 @@ read_config_string (struct options *options,

 #if ENABLE_INLINE_FILES

 	  check_inline_file_via_buf (&multiline, p, &options->gc);

 #endif

-	  add_option (options, 0, p, NULL, line_num, 0, msglevel, permission_mask, option_types_found, es);

+	  add_option (options, p, NULL, line_num, 0, msglevel, permission_mask, option_types_found, es);

 	}

       CLEAR (p);

     }

@@ -2837,7 +2836,7 @@ parse_argv (struct options *options,

       CLEAR (p);

       p[0] = "config";

       p[1] = argv[1];

-      add_option (options, 0, p, NULL, 0, 0, msglevel, permission_mask, option_types_found, es);

+      add_option (options, p, NULL, 0, 0, msglevel, permission_mask, option_types_found, es);

     }

   else

     {

@@ -2865,7 +2864,8 @@ parse_argv (struct options *options,

 		    break;

 		}

 	    }

-	  i = add_option (options, i, p, NULL, 0, 0, msglevel, permission_mask, option_types_found, es);

+	  add_option (options, p, NULL, 0, 0, msglevel, permission_mask, option_types_found, es);

+	  i += j - 1;

 	}

     }

 }

@@ -2889,7 +2889,7 @@ apply_push_options (struct options *options,

       ++line_num;

       if (parse_line (line, p, SIZE (p), file, line_num, msglevel, &options->gc))

 	{

-	  add_option (options, 0, p, file, line_num, 0, msglevel, permission_mask, option_types_found, es);

+	  add_option (options, p, file, line_num, 0, msglevel, permission_mask, option_types_found, es);

 	}

     }

   return true;

@@ -2960,21 +2960,6 @@ verify_permission (const char *name,

 #endif

 /*

- * Return the length of a string array

- */

-static int

-string_array_len (char *array[])

-{

-  int i = 0;

-  if (array)

-    {

-      while (array[i])

-	++i;

-    }

-  return i;

-}

-

-/*

  * Check that an option doesn't have too

  * many parameters.

  */

@@ -2987,7 +2972,7 @@ no_more_than_n_args (const int msglevel,

 		     const int max,

 		     const unsigned int flags)

 {

-  const int len = string_array_len (p);

+  const int len = string_array_len ((const char **)p);

   if (!len)

     return false;

@@ -3005,9 +2990,8 @@ no_more_than_n_args (const int msglevel,

     return true;

 }

-static int

+static void

 add_option (struct options *options,

-	    int i,

 	    char *p[],

 	    const char *file,

 	    int line,

@@ -3037,7 +3021,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "config") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_CONFIG);

       /* save first config file only in options */

@@ -3058,7 +3041,6 @@ add_option (struct options *options,

 	{

 	  if (!p[j])

 	    break;

-	  ++i;

 	  if (j > 1)

 	    buf_printf (&string, " ");

 	  buf_printf (&string, "%s", p[j]);

@@ -3076,7 +3058,6 @@ add_option (struct options *options,

     {

       int port;

-      i += 2;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       port = atoi (p[2]);

       if (!legal_ipv4_port (port))

@@ -3089,7 +3070,6 @@ add_option (struct options *options,

       options->management_port = port;

       if (p[3])

 	{

-	  ++i;

 	  options->management_user_pass = p[3];

 	}

     }

@@ -3107,7 +3087,6 @@ add_option (struct options *options,

     {

       int cache;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       cache = atoi (p[1]);

       if (cache < 1)

@@ -3121,15 +3100,10 @@ add_option (struct options *options,

 #ifdef ENABLE_PLUGIN

   else if (streq (p[0], "plugin") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_PLUGIN);

-      if (p[2])

-	++i;

-      if (!no_more_than_n_args (msglevel, p, 3, NM_QUOTE_HINT))

-	goto err;

       if (!options->plugin_list)

 	options->plugin_list = plugin_option_list_new (&options->gc);

-      if (!plugin_option_list_add (options->plugin_list, p[1], p[2]))

+      if (!plugin_option_list_add (options->plugin_list, &p[1], &options->gc))

 	{

 	  msg (msglevel, "plugin add failed: %s", p[1]);

 	  goto err;

@@ -3138,7 +3112,6 @@ add_option (struct options *options,

 #endif

   else if (streq (p[0], "mode") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (streq (p[1], "p2p"))

 	options->mode = MODE_POINT_TO_POINT;

@@ -3154,25 +3127,21 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "dev") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->dev = p[1];

     }

   else if (streq (p[0], "dev-type") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->dev_type = p[1];

     }

   else if (streq (p[0], "dev-node") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->dev_node = p[1];

     }

   else if (streq (p[0], "topology") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_UP);

       options->topology = parse_topology (p[1], msglevel);

     }

@@ -3183,7 +3152,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "ifconfig") && p[1] && p[2])

     {

-      i += 2;

       VERIFY_PERMISSION (OPT_P_UP);

       options->ifconfig_local = p[1];

       options->ifconfig_remote_netmask = p[2];

@@ -3200,7 +3168,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "local") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->local = p[1];

     }

@@ -3214,7 +3181,6 @@ add_option (struct options *options,

       struct remote_list *l;

       struct remote_entry e;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (!options->remote_list)

 	ALLOC_OBJ_CLEAR_GC (options->remote_list, struct remote_list, &options->gc);

@@ -3227,7 +3193,6 @@ add_option (struct options *options,

       e.hostname = p[1];

       if (p[2])

 	{

-	  ++i;

 	  e.port = atoi (p[2]);

 	  if (!legal_ipv4_port (e.port))

 	    {

@@ -3241,7 +3206,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "resolv-retry") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (streq (p[1], "infinite"))

 	options->resolve_retry_seconds = RESOLV_RETRY_INFINITE;

@@ -3250,14 +3214,12 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "connect-retry") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->connect_retry_seconds = positive_atoi (p[1]);

       options->connect_retry_defined = true;

     }

   else if (streq (p[0], "ipchange") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_SCRIPT);

       if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))

 	goto err;

@@ -3271,20 +3233,17 @@ add_option (struct options *options,

 #ifdef ENABLE_DEBUG

   else if (streq (p[0], "gremlin") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->gremlin = positive_atoi (p[1]);

     }

 #endif

   else if (streq (p[0], "chroot") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->chroot_dir = p[1];

     }

   else if (streq (p[0], "cd") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (openvpn_chdir (p[1]))

 	{

@@ -3295,13 +3254,11 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "writepid") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->writepid = p[1];

     }

   else if (streq (p[0], "up") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_SCRIPT);

       if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))

 	goto err;

@@ -3309,7 +3266,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "down") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_SCRIPT);

       if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))

 	goto err;

@@ -3333,8 +3289,6 @@ add_option (struct options *options,

   else if (streq (p[0], "syslog"))

     {

       VERIFY_PERMISSION (OPT_P_GENERAL);

-      if (p[1])

-       ++i;

       open_syslog (p[1], false);

     }

   else if (streq (p[0], "daemon"))

@@ -3348,7 +3302,6 @@ add_option (struct options *options,

 	}

       if (p[1])

 	{

-	  ++i;

 	  if (!didit)

 	    {

 	      msg (M_WARN, "WARNING: Multiple --daemon directives specified, ignoring --daemon %s. (Note that initscripts sometimes add their own --daemon directive.)", p[1]);

@@ -3371,7 +3324,6 @@ add_option (struct options *options,

 	    {

 	      if (p[z])

 		{

-		  ++i;

 		  if (streq (p[z], "wait"))

 		    {

 		      if (options->inetd != -1)

@@ -3414,21 +3366,18 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "log") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->log = true;

       redirect_stdout_stderr (p[1], false);

     }

   else if (streq (p[0], "suppress-timestamps"))

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->suppress_timestamps = true;

       set_suppress_timestamps(true);

     }

   else if (streq (p[0], "log-append") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->log = true;

       redirect_stdout_stderr (p[1], true);

@@ -3447,24 +3396,20 @@ add_option (struct options *options,

 #endif

   else if (streq (p[0], "verb") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MESSAGES);

       options->verbosity = positive_atoi (p[1]);

     }

   else if (streq (p[0], "mute") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MESSAGES);

       options->mute = positive_atoi (p[1]);

     }

   else if (streq (p[0], "status") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->status_file = p[1];

       if (p[2])

 	{

-	  ++i;

 	  options->status_file_update_freq = positive_atoi (p[2]);

 	}

     }

@@ -3472,7 +3417,6 @@ add_option (struct options *options,

     {

       int version;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       version = atoi (p[1]);

       if (version < 1 || version > 2)

@@ -3484,7 +3428,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "remap-usr1") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (streq (p[1], "SIGHUP"))

 	options->remap_sigusr1 = SIGHUP;

@@ -3498,21 +3441,18 @@ add_option (struct options *options,

     }

   else if ((streq (p[0], "link-mtu") || streq (p[0], "udp-mtu")) && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MTU);

       options->link_mtu = positive_atoi (p[1]);

       options->link_mtu_defined = true;

     }

   else if (streq (p[0], "tun-mtu") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MTU);

       options->tun_mtu = positive_atoi (p[1]);

       options->tun_mtu_defined = true;

     }

   else if (streq (p[0], "tun-mtu-extra") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MTU);

       options->tun_mtu_extra = positive_atoi (p[1]);

       options->tun_mtu_extra_defined = true;

@@ -3526,14 +3466,12 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "fragment") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MTU);

       options->fragment = positive_atoi (p[1]);

     }

 #endif

   else if (streq (p[0], "mtu-disc") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_MTU);

       options->mtu_discover_type = translate_mtu_discover_type_name (p[1]);

     }

@@ -3546,19 +3484,16 @@ add_option (struct options *options,

 #endif

   else if (streq (p[0], "nice") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_NICE);

       options->nice = atoi (p[1]);

     }

   else if (streq (p[0], "rcvbuf") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_SOCKBUF);

       options->rcvbuf = positive_atoi (p[1]);

     }

   else if (streq (p[0], "sndbuf") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_SOCKBUF);

       options->sndbuf = positive_atoi (p[1]);

     }

@@ -3568,7 +3503,6 @@ add_option (struct options *options,

       VERIFY_PERMISSION (OPT_P_SOCKFLAGS);

       for (j = 1; j < MAX_PARMS && p[j]; ++j)

 	{

-	  ++i;

 	  if (streq (p[j], "TCP_NODELAY"))

 	    options->sockflags |= SF_TCP_NODELAY;

 	  else

@@ -3577,7 +3511,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "txqueuelen") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

 #ifdef TARGET_LINUX

       options->tuntap_options.txqueuelen = positive_atoi (p[1]);

@@ -3589,7 +3522,6 @@ add_option (struct options *options,

 #ifdef USE_PTHREAD

   else if (streq (p[0], "nice-work") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_NICE);

       options->nice_work = atoi (p[1]);

     }

@@ -3597,7 +3529,6 @@ add_option (struct options *options,

     {

       int n_threads;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       n_threads = positive_atoi (p[1]);

       if (n_threads < 1)

@@ -3613,7 +3544,6 @@ add_option (struct options *options,

 #ifdef HAVE_GETTIMEOFDAY

       int shaper;

-      ++i;

       VERIFY_PERMISSION (OPT_P_SHAPER);

       shaper = atoi (p[1]);

       if (shaper < SHAPER_MIN || shaper > SHAPER_MAX)

@@ -3633,7 +3563,6 @@ add_option (struct options *options,

     {

       int port;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       port = atoi (p[1]);

       if (!legal_ipv4_port (port))

@@ -3648,7 +3577,6 @@ add_option (struct options *options,

     {

       int port;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       port = atoi (p[1]);

       if (!legal_ipv4_port (port))

@@ -3664,7 +3592,6 @@ add_option (struct options *options,

     {

       int port;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       port = atoi (p[1]);

       if (!legal_ipv4_port (port))

@@ -3692,14 +3619,12 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "inactive") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_TIMER);

       options->inactivity_timeout = positive_atoi (p[1]);

     }

   else if (streq (p[0], "proto") && p[1])

     {

       int proto;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       proto = ascii2proto (p[1]);

       if (proto < 0)

@@ -3717,7 +3642,6 @@ add_option (struct options *options,

       int port;

       struct http_proxy_options *ho;

-      i += 2;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       port = atoi (p[2]);

       if (!legal_ipv4_port (port))

@@ -3732,13 +3656,11 @@ add_option (struct options *options,

       ho->port = port;

       if (p[3])

 	{

-	  ++i;

 	  ho->auth_method_string = "basic";

 	  ho->auth_file = p[3];

 	  if (p[4])

 	    {

-	      ++i;

 	      ho->auth_method_string = p[4];

 	    }

 	}

@@ -3758,7 +3680,6 @@ add_option (struct options *options,

     {

       struct http_proxy_options *ho;

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       ho = init_http_options_if_undefined (options);

       ho->timeout = positive_atoi (p[1]);

@@ -3767,10 +3688,6 @@ add_option (struct options *options,

     {

       struct http_proxy_options *ho;

-      ++i;

-      if (p[2])

-	++i;

-

       VERIFY_PERMISSION (OPT_P_GENERAL);

       ho = init_http_options_if_undefined (options);

@@ -3791,13 +3708,11 @@ add_option (struct options *options,

 #ifdef ENABLE_SOCKS

   else if (streq (p[0], "socks-proxy") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (p[2])

 	{

 	  int port;

-	  ++i;

           port = atoi (p[2]);

           if (!legal_ipv4_port (port))

 	    {

@@ -3820,27 +3735,23 @@ add_option (struct options *options,

 #endif

   else if (streq (p[0], "keepalive") && p[1] && p[2])

     {

-      i += 2;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->keepalive_ping = atoi (p[1]);

       options->keepalive_timeout = atoi (p[2]);

     }

   else if (streq (p[0], "ping") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_TIMER);

       options->ping_send_timeout = positive_atoi (p[1]);

     }

   else if (streq (p[0], "ping-exit") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_TIMER);

       options->ping_rec_timeout = positive_atoi (p[1]);

       options->ping_rec_timeout_action = PING_EXIT;

     }

   else if (streq (p[0], "ping-restart") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_TIMER);

       options->ping_rec_timeout = positive_atoi (p[1]);

       options->ping_rec_timeout_action = PING_RESTART;

@@ -3856,7 +3767,6 @@ add_option (struct options *options,

       VERIFY_PERMISSION (OPT_P_EXPLICIT_NOTIFY);

       if (p[1])

 	{

-	  ++i;

 	  options->explicit_exit_notification = positive_atoi (p[1]);

 	}

       else

@@ -3887,20 +3797,12 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "route") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_ROUTE);

-      if (p[2])

-	++i;

-      if (p[3])

-	++i;

-      if (p[4])

-	++i;

       rol_check_alloc (options);

       add_route_to_option_list (options->routes, p[1], p[2], p[3], p[4]);

     }

   else if (streq (p[0], "route-gateway") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS);

       options->route_default_gateway = p[1];      

     }

@@ -3910,11 +3812,9 @@ add_option (struct options *options,

       options->route_delay_defined = true;

       if (p[1])

 	{

-	  ++i;

 	  options->route_delay = positive_atoi (p[1]);

 	  if (p[2])

 	    {

-	      ++i;

 	      options->route_delay_window = positive_atoi (p[2]);

 	    }

 	}

@@ -3925,7 +3825,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "route-up") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_SCRIPT);

       if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))

 	goto err;

@@ -3948,7 +3847,6 @@ add_option (struct options *options,

       rol_check_alloc (options);

       for (j = 1; j < MAX_PARMS && p[j] != NULL; ++j)

 	{

-	  ++i;

 	  if (streq (p[j], "local"))

 	    options->routes->flags |= RG_LOCAL;

 	  else if (streq (p[j], "def1"))

@@ -3967,7 +3865,6 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "setenv") && p[1] && p[2])

     {

-      i += 2;

       VERIFY_PERMISSION (OPT_P_SETENV);

       setenv_str (es, p[1], p[2]);

     }

@@ -3976,7 +3873,6 @@ add_option (struct options *options,

       VERIFY_PERMISSION (OPT_P_GENERAL);

       if (p[1])

 	{

-	  ++i;

 	  options->mssfix = positive_atoi (p[1]);

 	}

       else

@@ -3998,7 +3894,6 @@ add_option (struct options *options,

       bool error = false;

       in_addr_t network, netmask;

-      i += 2;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       network = get_ip_addr (p[1], lev, &error);

       netmask = get_ip_addr (p[2], lev, &error);

@@ -4013,7 +3908,6 @@ add_option (struct options *options,

       if (p[3])

 	{

-	  ++i;

 	  if (streq (p[3], "nopool"))

 	    options->server_flags |= SF_NOPOOL;

 	  else

@@ -4029,7 +3923,6 @@ add_option (struct options *options,

       bool error = false;

       in_addr_t ip, netmask, pool_start, pool_end;

-      i += 4;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       ip = get_ip_addr (p[1], lev, &error);

       netmask = get_ip_addr (p[2], lev, &error);

@@ -4048,11 +3941,8 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "push") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_PUSH);

-      push_option (options, p[1], msglevel);

-      if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))

-	goto err;

+      push_options (options, &p[1], msglevel, &options->gc);

     }

   else if (streq (p[0], "push-reset"))

     {

@@ -4065,13 +3955,11 @@ add_option (struct options *options,

       bool error = false;

       in_addr_t start, end, netmask=0;

-      i += 2;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       start = get_ip_addr (p[1], lev, &error);

       end = get_ip_addr (p[2], lev, &error);

       if (p[3])

 	{

-	  ++i;

 	  netmask = get_ip_addr (p[3], lev, &error);

 	}

       if (error)

@@ -4098,12 +3986,10 @@ add_option (struct options *options,

     }

   else if (streq (p[0], "ifconfig-pool-persist") && p[1])

     {

-      ++i;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->ifconfig_pool_persist_filename = p[1];

       if (p[2])

 	{

-	  ++i;

 	  options->ifconfig_pool_persist_refresh_freq = positive_atoi (p[2]);

 	}

     }

@@ -4116,7 +4002,6 @@ add_option (struct options *options,

     {

       int real, virtual;

-      i += 2;

       VERIFY_PERMISSION (OPT_P_GENERAL);

       real = atoi (p[1]);