| Message ID | 20200701122239.6924-1-arne@rfc2549.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Remove parameter config from multi_client_connect_mda | expand |
Hi, On 01/07/2020 14:22, Arne Schwabe wrote: > config is always used as mi->cc_config and we pass mi, > so directly use mi->cc_config > > Signed-off-by: Arne Schwabe <arne@rfc2549.org> Acked-by: Antonio Quartulli <a@unstable.cc>
Your patch has been applied to the master branch.
(Haven't done any testing, but patch looks "obviously correct" and Antonio
beat me to ACKing it anyway :) )
commit 9f0a7dcc7fa21228dbd40d976aaee5a90ac48299
Author: Arne Schwabe
Date: Wed Jul 1 14:22:39 2020 +0200
Remove parameter config from multi_client_connect_mda
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Antonio Quartulli <antonio@openvpn.net>
Message-Id: <20200701122239.6924-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20177.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 95b16744..19261c37 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1722,11 +1722,10 @@ multi_client_connect_post_plugin(struct multi_context *m, static void multi_client_connect_mda(struct multi_context *m, struct multi_instance *mi, - const struct buffer_list *config, unsigned int option_permissions_mask, unsigned int *option_types_found) { - if (config) + if (mi->cc_config) { struct buffer_entry *be; @@ -1986,7 +1985,7 @@ script_failed: #ifdef MANAGEMENT_DEF_AUTH if (cc_succeeded && mi->cc_config) { - multi_client_connect_mda(m, mi, mi->cc_config, option_permissions_mask, &option_types_found); + multi_client_connect_mda(m, mi, option_permissions_mask, &option_types_found); ++cc_succeeded_count; } #endif
config is always used as mi->cc_config and we pass mi, so directly use mi->cc_config Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/multi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)