diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-09-30 21:10:56 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-09-30 21:10:56 +0200 |
| commit | c3a748571ed19f9259b2e63cd7ba56abdb1b7747 (patch) | |
| tree | ef419b35f5a1632a8b0c3ab6faa773eed9c6788a /src/openvpn/options.c | |
| parent | b97ad09a3b8c0017db0a677667a7215f1a98cccf (diff) | |
| parent | 5246174f27866c0e9e22844d998f3c97cac54050 (diff) | |
Update upstream source from tag 'upstream/2.5_rc2'
Update to upstream version '2.5~rc2'
with Debian dir 0cd2307abadc06f5064e4d5e7c23689a67b720c5
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 8bf82c5..3df803d 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2181,10 +2181,11 @@ options_postprocess_verify_ce(const struct options *options, const struct connec } if (options->tuntap_options.dhcp_options + && options->windows_driver != WINDOWS_DRIVER_WINTUN && options->tuntap_options.ip_win32_type != IPW32_SET_DHCP_MASQ && options->tuntap_options.ip_win32_type != IPW32_SET_ADAPTIVE) { - msg(M_USAGE, "--dhcp-options requires --ip-win32 dynamic or adaptive"); + msg(M_USAGE, "--dhcp-option requires --ip-win32 dynamic or adaptive"); } if (options->windows_driver == WINDOWS_DRIVER_WINTUN && dev != DEV_TYPE_TUN) @@ -7439,7 +7440,8 @@ add_option(struct options *options, VERIFY_PERMISSION(OPT_P_IPWIN32); bool ipv6dns = false; - if (streq(p[1], "DOMAIN") && p[2]) + if ((streq(p[1], "DOMAIN") || streq(p[1], "ADAPTER_DOMAIN_SUFFIX")) + && p[2]) { o->domain = p[2]; } |