diff options
| author | Heiko Hund <heiko.hund@sophos.com> | 2013-02-22 10:44:20 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-03-07 20:31:02 +0100 |
| commit | c86d09c7c115eeda96ea0b2a400c3ce57bd90292 (patch) | |
| tree | f2c98f77e44232e45be87868adf59c5feb4b7bc1 /src/openvpn/options.c | |
| parent | 55058d4f96dfec96e9f0cad7802a5eaaf9a3301f (diff) | |
| download | openvpn-c86d09c7c115eeda96ea0b2a400c3ce57bd90292.tar.gz openvpn-c86d09c7c115eeda96ea0b2a400c3ce57bd90292.tar.xz openvpn-c86d09c7c115eeda96ea0b2a400c3ce57bd90292.zip | |
reintroduce --no-name-remapping option
The option is just an alias for --compat-names no-remapping and is
introduced so pre-2.3 server configurations don't break.
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: 1361526263-1740-2-git-send-email-heiko.hund@sophos.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/7364
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 26b0433c4a642f8d2197f3fd371759f0047bd0bd)
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 3b5f1e7..dd38bc9 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -5561,13 +5561,6 @@ add_option (struct options *options, VERIFY_PERMISSION (OPT_P_GENERAL); options->ssl_flags |= SSLF_AUTH_USER_PASS_OPTIONAL; } - else if (streq (p[0], "compat-names")) - { - VERIFY_PERMISSION (OPT_P_GENERAL); - compat_flag (COMPAT_FLAG_SET | COMPAT_NAMES); - if (p[1] && streq (p[1], "no-remapping")) - compat_flag (COMPAT_FLAG_SET | COMPAT_NO_NAME_REMAPPING); - } else if (streq (p[0], "opt-verify")) { VERIFY_PERMISSION (OPT_P_GENERAL); @@ -6518,6 +6511,20 @@ add_option (struct options *options, options->tls_export_cert = p[1]; } #endif + else if (streq (p[0], "compat-names")) + { + VERIFY_PERMISSION (OPT_P_GENERAL); + compat_flag (COMPAT_FLAG_SET | COMPAT_NAMES); + if (p[1] && streq (p[1], "no-remapping")) + compat_flag (COMPAT_FLAG_SET | COMPAT_NO_NAME_REMAPPING); + } + else if (streq (p[0], "no-name-remapping")) + { + VERIFY_PERMISSION (OPT_P_GENERAL); + msg (M_WARN, "DEPRECATED OPTION: --no-name-remapping, please update your configuration"); + compat_flag (COMPAT_FLAG_SET | COMPAT_NAMES); + compat_flag (COMPAT_FLAG_SET | COMPAT_NO_NAME_REMAPPING); + } else if (streq (p[0], "tls-remote") && p[1]) { VERIFY_PERMISSION (OPT_P_GENERAL); |