(Only) on "CC_RET_SUCCESS", run multi_client_connect_post().

On "CC_RET_FAILURE", add missing log line, do not call ..._post().

Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
 src/openvpn/multi.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 08112c98..e99de713 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -2139,13 +2139,19 @@ multi_client_connect_script_deferred(struct 
multi_context *m,
         ret = CC_RET_DEFERRED;
     }
 
-    if (ret != CC_RET_DEFERRED)
+    if (ret == CC_RET_SUCCEEDED)
     {
         ccs_delete_deferred_ret_file(mi);
         multi_client_connect_post(m, mi, ccs->config_file,
                                   option_types_found);
         ccs_delete_config_file(mi);
     }
+    if (ret == CC_RET_FAILED)
+    {
+       msg(M_INFO, "MULTI: deferred --client-connect script returned 
CC_RET_FAILED");
+        ccs_delete_deferred_ret_file(mi);
+        ccs_delete_config_file(mi);
+    }
     return ret;
 }
 
-- 
2.26.2



_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to