From: Antonio Quartulli Date: Fri, 8 May 2020 21:14:34 +0000 (+0200) Subject: options: fix inlining auth-gen-token-secret file X-Git-Tag: v2.5_beta1~145 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=416162c5b66055da24e6e7b8acde4e7bb8f67522;p=thirdparty%2Fopenvpn.git options: fix inlining auth-gen-token-secret file With commit ("convert *_inline attributes to bool") the logic for signaling when a certain option is inline has been changed. Due to an overlook, the auth-gen-token-secret was not converted, thus making it impossible to be inlined. Fix parsing logic and allow auth-gen-token-secret to be inlined as well. Signed-off-by: Antonio Quartulli Acked-by: David Sommerseth Message-Id: <20200508211434.27545-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19862.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 56c9e4111..2d2089e3b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -6981,16 +6981,12 @@ add_option(struct options *options, } } - else if (streq(p[0], "auth-gen-token-secret") && p[1] && (!p[2] - || (p[2] && streq(p[1], INLINE_FILE_TAG)))) + else if (streq(p[0], "auth-gen-token-secret") && p[1] && !p[2]) { - VERIFY_PERMISSION(OPT_P_GENERAL); + VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_INLINE); options->auth_token_secret_file = p[1]; + options->auth_token_secret_file_inline = is_inline; - if (streq(p[1], INLINE_FILE_TAG) && p[2]) - { - options->auth_token_secret_file_inline = p[2]; - } } else if (streq(p[0], "client-connect") && p[1]) {