diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-09-13 15:47:05 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-09-13 15:47:05 +0200 |
| commit | 3614a999bce8ce7230173013663c7716a2232941 (patch) | |
| tree | 9d8d4d4e6e894e03ef7f76120ccd6b9858e8597c /openvpn/src/openvpn/options.c | |
| parent | d94cbc6f56743d3152cf7d14783737ea8ee740a0 (diff) | |
Update openvpn to https://github.com/schwabe/openvpn/tree/android_2.3beta1
Diffstat (limited to 'openvpn/src/openvpn/options.c')
| -rw-r--r-- | openvpn/src/openvpn/options.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c index 36fb4e30..47aaffcb 100644 --- a/openvpn/src/openvpn/options.c +++ b/openvpn/src/openvpn/options.c @@ -2132,6 +2132,9 @@ options_postprocess_verify_ce (const struct options *options, const struct conne if (options->stale_routes_check_interval) msg (M_USAGE, "--stale-routes-check requires --mode server"); + + if (compat_flag (COMPAT_FLAG_QUERY | COMPAT_NO_NAME_REMAPPING)) + msg (M_USAGE, "--compat-x509-names no-remapping requires --mode server"); } #endif /* P2MP_SERVER */ @@ -2248,7 +2251,7 @@ options_postprocess_verify_ce (const struct options *options, const struct conne const int sum = (options->cert_file != NULL) + #ifdef MANAGMENT_EXTERNAL_KEY ((options->priv_key_file != NULL) || (options->management_flags & MF_EXTERNAL_KEY)); -#else +#else (options->priv_key_file != NULL); #endif @@ -5550,6 +5553,13 @@ 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); |