From: Arne Schwabe Date: Fri, 24 Jul 2020 14:25:57 +0000 (+0200) Subject: Add a note that ncp-ciphers is replaced by data-ciphers X-Git-Tag: v2.5_beta1~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342f9b78f107530f67581d6247d38af0792e4243;p=thirdparty%2Fopenvpn.git Add a note that ncp-ciphers is replaced by data-ciphers This patch adds a message that informs the user that the ncp-cipher is renamed to data-ciphers. This should address the following concerns: - Users being confused by old options. - Nudge users to use the modern variant of an option The man page already documents ncp-ciphers as an old name for data-ciphers, so looking it up in the man page will also work. Note that I did not add "deprecated old option" to this message since I still think that eventually removing the option will only break configs and we gain almost nothing from that. Also still accepting the option even though we do not recommend usage of it also follows the robustness principle of: "be strict in what you send and tolerant in what you receive" Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20200724142557.25204-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20573.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 58272221d..bc256b18e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7867,6 +7867,11 @@ add_option(struct options *options, && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_INSTANCE); + if (streq(p[0], "ncp-ciphers")) + { + msg(M_INFO, "Note: Treating option '--ncp-ciphers' as " + " '--data-ciphers' (renamed in OpenVPN 2.5)."); + } options->ncp_ciphers = p[1]; } else if (streq(p[0], "ncp-disable") && !p[1])