upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-11 01:40:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

options: Remove some verbose error messages for options deprecated in 2.4

Browse source 
It has been a long time since 2.3. So move this from the code
to the documentation.

Includes some minimal drive-by fixes.

Change-Id: I59995bf0fd6bc48a738a94e41141ed37d8d637ba
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1427
Message-Id: <20251210075056.27185-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34972.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2025-12-10 08:50:50 +01:00 committed by Gert Doering
parent 2ab3e8733e
commit d4df0a3fbc
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/man-sections/unsupported-options.rst
View file

@ -6,9 +6,16 @@ Options listed in this section have been removed from OpenVPN and are no
longer supported
--client-cert-not-required
Removed in OpenVPN 2.5. This should be replaxed with
Removed in OpenVPN 2.5. This should be replaced with
``--verify-client-cert none``.
--http-proxy-retry
Removed in OpenVPN 2.4. All retries are controlled by ``--max-connect-retry``.
--http-proxy-timeout
Removed in OpenVPN 2.4. Connection timeout is controlled by
``--connect-timeout``.
--ifconfig-pool-linear
Removed in OpenVPN 2.5. This should be replaced with ``--topology p2p``.
@ -21,6 +28,9 @@ longer supported
Removed in OpenVPN 2.6. The built-in packet filtering (pf) functionality
has been removed.
--max-routes
Removed in OpenVPN 2.4. The limit was removed.
--ncp-disable
Removed in OpenVPN 2.6. This option mainly served a role as debug option
when NCP was first introduced. It should no longer be necessary.
@ -50,6 +60,9 @@ longer supported
Removed in OpenVPN 2.7. This option does not make sense anymore as option
strings may not match due to the introduction of parameters negotiation.
--socks-proxy-retry
Removed in OpenVPN 2.4. All retries are controlled by ``--max-connect-retry``.
--windows-driver
Removed in OpenVPN 2.7. OpenVPN will always use ovpn-dco as the default
driver on Windows. It will fall back to tap-windows6 if options are used

20
src/openvpn/options.c
View file

@ -6699,19 +6699,10 @@ add_option(struct options *options, char *p[], bool is_inline, const char *file,
ho->auth_file_up = p[1];
ho->inline_creds = is_inline;
}
else if (streq(p[0], "http-proxy-retry") || streq(p[0], "socks-proxy-retry"))
else if (streq(p[0], "http-proxy-retry") || streq(p[0], "socks-proxy-retry") || streq(p[0], "http-proxy-timeout"))
{
VERIFY_PERMISSION(OPT_P_GENERAL | OPT_P_CONNECTION);
msg(M_WARN, "DEPRECATED OPTION: http-proxy-retry and socks-proxy-retry: "
"In OpenVPN 2.4 proxy connection retries are handled like regular connections. "
"Use connect-retry-max 1 to get a similar behavior as before.");
}
else if (streq(p[0], "http-proxy-timeout") && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_GENERAL | OPT_P_CONNECTION);
msg(M_WARN,
"DEPRECATED OPTION: http-proxy-timeout: In OpenVPN 2.4 the timeout until a connection to a "
"server is established is managed with a single timeout set by connect-timeout");
msg(M_WARN, "DEPRECATED OPTION: %s option ignored.", p[0]);
}
else if (streq(p[0], "http-proxy-option") && p[1] && !p[4])
{
@ -6826,7 +6817,7 @@ add_option(struct options *options, char *p[], bool is_inline, const char *file,
else if (streq(p[0], "persist-key") && !p[1])
{
VERIFY_PERMISSION(OPT_P_PERSIST);
msg(M_WARN, "DEPRECATED: --persist-key option ignored. "
msg(M_WARN, "DEPRECATED OPTION: --persist-key option ignored. "
"Keys are now always persisted across restarts. ");
}
else if (streq(p[0], "persist-local-ip") && !p[1])
@ -6875,10 +6866,7 @@ add_option(struct options *options, char *p[], bool is_inline, const char *file,
}
else if (streq(p[0], "max-routes") && !p[2])
{
msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored. "
"The number of routes is unlimited as of OpenVPN 2.4. "
"This option will be removed in a future version, "
"please remove it from your configuration.");
msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored.");
}
else if (streq(p[0], "route-gateway") && p[1] && !p[2])
{