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 <a...@unstable.cc>
---
src/openvpn/options.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 56c9e411..2d2089e3 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])
{
--
2.26.2
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
