From: Lev Stipakov <l...@openvpn.net> When tap-windows6 driver is used, both --dhcp-option and --dns options are applied with DHCP. When processing --dns options, we don't set "tuntap_options.dhcp_options" member, which is required for DHCP string to be sent to the driver. As a result, --dns options are not applied at all.
Fix by adding missing assignment of tuntap_options.dhcp_options. Fixes https://github.com/OpenVPN/openvpn/issues/447 Change-Id: I24f43ad319bd1ca530fe17442d02a97412eb75c7 Signed-off-by: Lev Stipakov <l...@openvpn.net> Acked-by: Frank Lichtenheld <fr...@lichtenheld.com> --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/427 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Frank Lichtenheld <fr...@lichtenheld.com> diff --git a/src/openvpn/options.c b/src/openvpn/options.c index b88fea9..abd2e0c 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1364,6 +1364,8 @@ { msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to --dhcp-option"); } + + tt->dhcp_options |= DHCP_OPTIONS_DHCP_REQUIRED; } if (dns->servers) @@ -1401,6 +1403,7 @@ { msg(M_WARN, "WARNING: couldn't copy all --dns server addresses to --dhcp-option"); } + tt->dhcp_options |= DHCP_OPTIONS_DHCP_OPTIONAL; } } #else /* if defined(_WIN32) || defined(TARGET_ANDROID) */ _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
