summaryrefslogtreecommitdiff
path: root/openvpn/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-12-16 10:31:43 +0100
committerArne Schwabe <arne@rfc2549.org>2012-12-16 10:31:43 +0100
commit56e466e15d21530fb67ebf01514f85a8e5aa170a (patch)
tree5742921eb1c28109aa762e405ea91ee09a70b1a3 /openvpn/src
parente6bad64bdfde2be997020f22d8e5a129173140f3 (diff)
connect-retry fix
Diffstat (limited to 'openvpn/src')
-rw-r--r--openvpn/src/openvpn/options.c6
-rw-r--r--openvpn/src/openvpn/options.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c
index 158e155f..6a618212 100644
--- a/openvpn/src/openvpn/options.c
+++ b/openvpn/src/openvpn/options.c
@@ -1859,11 +1859,6 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
/*
* Sanity check on TCP mode options
*/
-
- if (ce->connect_retry_defined && ce->proto != PROTO_TCP_CLIENT)
- msg (M_USAGE, "--connect-retry doesn't make sense unless also used with "
- "--proto tcp-client or tcp6-client");
-
if (ce->connect_timeout_defined && ce->proto != PROTO_TCP_CLIENT)
msg (M_USAGE, "--connect-timeout doesn't make sense unless also used with "
"--proto tcp-client or tcp6-client");
@@ -4397,7 +4392,6 @@ add_option (struct options *options,
{
VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION);
options->ce.connect_retry_seconds = positive_atoi (p[1]);
- options->ce.connect_retry_defined = true;
}
else if (streq (p[0], "connect-timeout") && p[1])
{
diff --git a/openvpn/src/openvpn/options.h b/openvpn/src/openvpn/options.h
index 62b1cbf3..91387845 100644
--- a/openvpn/src/openvpn/options.h
+++ b/openvpn/src/openvpn/options.h
@@ -97,7 +97,6 @@ struct connection_entry
bool bind_defined;
bool bind_local;
int connect_retry_seconds;
- bool connect_retry_defined;
int connect_timeout;
bool connect_timeout_defined;
#ifdef ENABLE_HTTP_PROXY