Separate handling of non-deferred return values for client-connect-scripts.
PATCH 1/1 Separate handling of non-deferred return values for client-connect-scripts.
(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 <[email protected]...>
--- src/openvpn/multi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
src/openvpn/multi.c +7 -1
@@ -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; }
Signature · 1 line
2.26.2
Am 20.07.20 um 09:08 schrieb Gert Doering:
Quoted 23 lines
(Only) on "
CC_RET_SUCCESS", runmulti_client_connect_post().On "
CC_RET_FAILURE", add missing log line, do not call ..._post().Signed-off-by Gert Doering <[email protected]...>--- src/openvpn/multi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)src/openvpn/multi.c +1
-1@@ -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);
src/openvpn/multi.c multi_client_connect_script_deferred(struct multi_context *m, · line 2156
Quoted 10 lines
src/openvpn/multi.c +6
-0ccs_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; }
Looks good to me. Reading the config file on failed should not hurt but is a very weird thing to do.
Acked-by Arne Schwabe <[email protected]...>
Patch has been applied to the master branch.
commit 3658e57797656e63e35be65397101a7191897272
Author: Gert Doering Date: Mon Jul 20 09:08:02 2020 +0200
Separate handling of non-deferred return values for client-connect-scripts.
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Arne Schwabe <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg20488.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering