Correct the declaration of handle in 'struct openvpn_plugin_args_open_return'
PATCH 1/1 Correct the declaration of handle in 'struct openvpn_plugin_args_open_return'
From: Selva Nair <[email protected]...>
- This is an opaque pointer so the change should not affect existing plugins. But it makes the code consistent and clears up the documentation as the handle pointer is treated as of type "openvpn_plugin_handle_t" in the rest of the code.
--- include/openvpn-plugin.h.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/openvpn-plugin.h.in +4 -4
@@ -355,7 +355,7 @@ struct openvpn_plugin_args_open_in * type_mask = OPENVPN_PLUGIN_MASK(OPENVPN_PLUGIN_CLIENT_CONNECT) * | OPENVPN_PLUGIN_MASK(OPENVPN_PLUGIN_CLIENT_DISCONNECT) * - * *handle : Pointer to a global plug-in context, created by the plug-in. This pointer + * handle : Pointer to a global plug-in context, created by the plug-in. This pointer * is passed on to the other plug-in calls. * * return_list : used to return data back to OpenVPN.
@@ -364,7 +364,7 @@ struct openvpn_plugin_args_open_in struct openvpn_plugin_args_open_return { int type_mask; - openvpn_plugin_handle_t *handle; + openvpn_plugin_handle_t handle; struct openvpn_plugin_string_list **return_list; };
@@ -386,9 +386,9 @@ struct openvpn_plugin_args_open_return * these variables are not actually written to the "official" * environmental variable store of the process. * - * *handle : Pointer to a global plug-in context, created by the plug-in's openvpn_plugin_open_v3(). + * handle : Pointer to a global plug-in context, created by the plug-in's openvpn_plugin_open_v3(). * - * *per_client_context : the per-client context pointer which was returned by + * per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined)
Signature · 1 line
2.1.4
PATCH 1/1 Correct the declaration of handle in 'struct openvpn_plugin_args_open_return'
From: Selva Nair <[email protected]...>
- This is an opaque pointer so the change should not affect existing plugins. But it makes the code consistent and clears up the documentation as the handle pointer is treated as of type "openvpn_plugin_handle_t" in the rest of the code.
---
v2: no change
include/openvpn-plugin.h.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/openvpn-plugin.h.in +4 -4
@@ -355,7 +355,7 @@ struct openvpn_plugin_args_open_in * type_mask = OPENVPN_PLUGIN_MASK(OPENVPN_PLUGIN_CLIENT_CONNECT) * | OPENVPN_PLUGIN_MASK(OPENVPN_PLUGIN_CLIENT_DISCONNECT) * - * *handle : Pointer to a global plug-in context, created by the plug-in. This pointer + * handle : Pointer to a global plug-in context, created by the plug-in. This pointer * is passed on to the other plug-in calls. * * return_list : used to return data back to OpenVPN.
@@ -364,7 +364,7 @@ struct openvpn_plugin_args_open_in struct openvpn_plugin_args_open_return { int type_mask; - openvpn_plugin_handle_t *handle; + openvpn_plugin_handle_t handle; struct openvpn_plugin_string_list **return_list; };
@@ -386,9 +386,9 @@ struct openvpn_plugin_args_open_return * these variables are not actually written to the "official" * environmental variable store of the process. * - * *handle : Pointer to a global plug-in context, created by the plug-in's openvpn_plugin_open_v3(). + * handle : Pointer to a global plug-in context, created by the plug-in's openvpn_plugin_open_v3(). * - * *per_client_context : the per-client context pointer which was returned by + * per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined)
Signature · 1 line
2.1.4
Hi,
Quoted 8 lines · On 21/11/17 09:43, [email protected]... wrote:
From: Selva Nair <[email protected]...>
- This is an opaque pointer so the change should not affect existing plugins. But it makes the code consistent and clears up the documentation as the handle pointer is treated as of type "
openvpn_plugin_handle_t" in the rest of the code.Signed-off-by Selva Nair <[email protected]...>
Will make some noise during application (git pw patch apply 87), such as:
"Falling back to patching base and 3-way merge..."
But it won't generate any conflict.
Signature · 1 line
Antonio Quartulli
Hi,
Quoted 8 lines · Antonio Quartulli
Quoted 7 lines · On 21/11/17 09:43, [email protected]... wrote:
From: Selva Nair <[email protected]...>
- This is an opaque pointer so the change should not affect existing plugins. But it makes the code consistent and clears up the documentation as the handle pointer is treated as of type "
openvpn_plugin_handle_t" in the rest of the code.
Quoted 8 lines
Quoted 1 line
Signed-off-by Selva Nair <[email protected]...>Will make some noise during application (git pw patch apply 87), such as:
"Falling back to patching base and 3-way merge..."But it won't generate any conflict.
Oh, we had the patch on the list already. Thanks for finding it & ACK.
I'll apply tomorrow or thursday, on the road right now.
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Your patch has been applied to the master and release/2.4 branch (bugfix).
The "git complains" part was due to patch context still talking about ENABLE_CRYPTO, which doesn't exist anymore in master - easily workarounded.
commit a2f43c2d6f086e7aa8b6160793f0c462ee9d6aa7 (master) commit 359e66bcb17c856a74cada9136ae1b8f411a2493 (release/2.4)
Author: Selva Nair Date: Mon Nov 20 20:43:25 2017 -0500
Correct the declaration of handle in 'struct openvpn_plugin_args_open_return'
Signed-off-by: Selva Nair <[email protected]...>
Acked-by: Antonio Quartulli <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg15908.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering