Skip to contentSkip to conversation

Remove parameter config from multi_client_connect_mda

PATCH In review Arne Schwabe 3 participants 3 messages Jul 1, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 src/openvpn/multi.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
src/openvpn/multi.c +2 -3
index 95b16744..19261c37 100644
@@ -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
Signature · 1 line
2.26.2
#2 lore raw
In reply to Arne Schwabe

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 <[email protected]...>
     Acked-by: Antonio Quartulli <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg20177.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering