diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-05-30 22:26:43 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-05-31 09:58:47 +0200 |
| commit | 9b6a5028111cd915b0342fbd2ecd0b9dfd4aa94a (patch) | |
| tree | c2c536a04fa218873fbbf2ed3eed694226a94d35 /src/openvpn/init.c | |
| parent | 1eb9a1271053fa95fbe8e7e973a47cce529d673d (diff) | |
| download | openvpn-9b6a5028111cd915b0342fbd2ecd0b9dfd4aa94a.tar.gz openvpn-9b6a5028111cd915b0342fbd2ecd0b9dfd4aa94a.tar.xz openvpn-9b6a5028111cd915b0342fbd2ecd0b9dfd4aa94a.zip | |
Move settings of user script into set_user_script function
This also fixes commit 567bfc06d051b60e9cdca1f5bb468631b899682a if not all
script options are available by setting options->user_script_used
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1369945603-17169-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7634
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/init.c')
| -rw-r--r-- | src/openvpn/init.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 7488923..cf0498d 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2542,11 +2542,8 @@ do_option_warnings (struct context *c) msg (M_WARN, "NOTE: --connect-timeout option is not supported on this OS"); #endif - /* Check if a script is used and print approiate warnings */ - if (o->up_script || o->ipchange || o->down_script || o->route_script - || o->route_predown_script || o->auth_user_pass_verify_script - || o->client_disconnect_script || o->client_connect_script - || o->learn_address_script || o->tls_verify) + /* If a script is used, print appropiate warnings */ + if (o->user_script_used) { if (script_security >= SSEC_SCRIPTS) msg (M_WARN, "NOTE: the current --script-security setting may allow this configuration to call user-defined scripts"); |