[Openvpn-devel] Fix async push broken after auth deferred refactor

Message ID 20210403122444.17090-1-arne@rfc2549.org
State Accepted
Headers show
Series [Openvpn-devel] Fix async push broken after auth deferred refactor | expand

Commit Message

Arne Schwabe April 3, 2021, 1:24 a.m. UTC
Commit c5fec838e moved the auth control file related
states into its own struct. Unfortunately I forgot
to also do the part inside #if defined(ENABLE_ASYNC_PUSH)

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
 src/openvpn/multi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Gert Doering April 3, 2021, 2:53 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Yeah, right.  Sorry for not noticing.  None of my current client tests
build with --enable-async-push, and the server testbed only does this
on other days (some of the build options are varied by day of the week), 
so I shouldn't have tested this on a Saturday...  "today is 
--enable-iproute2 day".

Anyway, the patch makes very obvious sense, and fixes the breakage

Your patch has been applied to the master branch.

commit 5ac8c3c7a2a761b8430ad2a494afcda8b48fca76
Author: Arne Schwabe
Date:   Sat Apr 3 14:24:44 2021 +0200

     Fix async push broken after auth deferred refactor

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20210403122444.17090-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22007.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 72f66c5bb..7c9500f3e 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -2984,11 +2984,11 @@  multi_process_post(struct multi_context *m, struct multi_instance *mi, const uns
          * and an auth_control_file, we assume it got just added and add
          * inotify watch to that file
-        if (ks && ks->auth_control_file && was_unauthenticated
+        if (ks && ks->plugin_auth.auth_control_file && was_unauthenticated
             && (ks->authenticated == KS_AUTH_DEFERRED))
             add_inotify_file_watch(m, mi, m->top.c2.inotify_fd,
-                                   ks->auth_control_file);
+                                   ks->plugin_auth.auth_control_file);