From: Arne Schwabe Date: Wed, 1 Jul 2020 12:22:39 +0000 (+0200) Subject: Remove parameter config from multi_client_connect_mda X-Git-Tag: v2.5_beta1~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f0a7dcc7fa21228dbd40d976aaee5a90ac48299;p=thirdparty%2Fopenvpn.git Remove parameter config from multi_client_connect_mda config is always used as mi->cc_config and we pass mi, so directly use mi->cc_config Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli 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 --- diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 95b167444..19261c37b 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