From d8496285948b814d78ee4be6ded08ce02046f8ee Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Tue, 7 Aug 2018 22:44:30 -0400 Subject: [PATCH] Bump version of openvpn plugin argument structs to 5 This was missed in commit 6690769f78bbfb889fef2a54088d979896c87d51 that exported base64_encode and base64_decode() functions. Also check the version is >= 5 in auth-pam plugin to ensure that the base64_decode function pointer can be referenced. Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <1533696271-21799-1-git-send-email-selva.nair@gmail.com> URL: https://www.mail-archive.com/search?l=mid&q=1533696271-21799-1-git-send-email-selva.nair@gmail.com Signed-off-by: Gert Doering (cherry picked from commit da0a42ca98623487726162b8710690cd3d003a63) --- include/openvpn-plugin.h.in | 5 +++-- src/plugins/auth-pam/auth-pam.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/openvpn-plugin.h.in b/include/openvpn-plugin.h.in index e71ad3055..a604f1c1e 100644 --- a/include/openvpn-plugin.h.in +++ b/include/openvpn-plugin.h.in @@ -221,10 +221,11 @@ struct openvpn_plugin_string_list * OpenVPN to plug-ins. * * 4 Exported secure_memzero() as plugin_secure_memzero() - * Exported openvpn_base64_encode() as plugin_base64_encode() + * + * 5 Exported openvpn_base64_encode() as plugin_base64_encode() * Exported openvpn_base64_decode() as plugin_base64_decode() */ -#define OPENVPN_PLUGINv3_STRUCTVER 4 +#define OPENVPN_PLUGINv3_STRUCTVER 5 /** * Definitions needed for the plug-in callback functions. diff --git a/src/plugins/auth-pam/auth-pam.c b/src/plugins/auth-pam/auth-pam.c index 26b0eeba9..5ba4dc4cb 100644 --- a/src/plugins/auth-pam/auth-pam.c +++ b/src/plugins/auth-pam/auth-pam.c @@ -292,8 +292,8 @@ openvpn_plugin_open_v3(const int v3structver, const char **argv = args->argv; const char **envp = args->envp; - /* Check API compatibility -- struct version 4 or higher needed */ - if (v3structver < 4) + /* Check API compatibility -- struct version 5 or higher needed */ + if (v3structver < 5) { fprintf(stderr, "AUTH-PAM: This plugin is incompatible with the running version of OpenVPN\n"); return OPENVPN_PLUGIN_FUNC_ERROR; -- 2.47.2