From: Gert Doering Date: Thu, 18 May 2017 19:13:11 +0000 (+0200) Subject: Remove erroneous limitation on max number of args for --plugin X-Git-Tag: v2.4.3~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4d200a34617388e45837b7a9a8ccb25a7b1aa99;p=thirdparty%2Fopenvpn.git Remove erroneous limitation on max number of args for --plugin Commit 3d6a4cded2 introduced a maximum limit of possible arguments for most options, to error out on config lines with too-many args. Commit 82acf21634 extended the limit for "--plugin" to accept "one mandatory, one optional" argument. Both are wrong - "--plugin" can accept an arbitrary number of arguments, but this is not directly obvious from options.c, one needs to check plugins.c / plugin_option_list_add() and misc.c / make_extended_arg_array() to see that. Thus, remove the max limit for "--plugin" completely. (Reported by SviMik on IRC) Signed-off-by: Gert Doering Acked-by: Steffan Karger Message-Id: <20170518191311.4769-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14678.html Signed-off-by: Gert Doering (cherry picked from commit 3f181eaa324892845e0857d80c154512d9e8c59c) --- diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 4ce46b147..57818e132 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -5168,7 +5168,7 @@ add_option(struct options *options, } #endif /* ifdef ENABLE_MANAGEMENT */ #ifdef ENABLE_PLUGIN - else if (streq(p[0], "plugin") && p[1] && !p[3]) + else if (streq(p[0], "plugin") && p[1]) { VERIFY_PERMISSION(OPT_P_PLUGIN); if (!options->plugin_list)