cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/423?usp=email )
Change subject: Make --dns options apply for tap-windows6 driver ...................................................................... Make --dns options apply for tap-windows6 driver 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. Github: fixes OpenVPN/openvpn#447 Change-Id: I24f43ad319bd1ca530fe17442d02a97412eb75c7 Signed-off-by: Lev Stipakov <l...@openvpn.net> Acked-by: Frank Lichtenheld <fr...@lichtenheld.com> Message-Id: <20231115120623.6442-1-g...@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27402.html Signed-off-by: Gert Doering <g...@greenie.muc.de> (cherry picked from commit 60def50420b050e628f4388e3c9ff771eb70a549) --- M src/openvpn/options.c 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 895ce83..9502982 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1372,6 +1372,7 @@ { msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to --dhcp-option"); } + tt->dhcp_options |= DHCP_OPTIONS_DHCP_REQUIRED; } if (dns->servers) @@ -1409,6 +1410,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) */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/423?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: release/2.6 Gerrit-Change-Id: I24f43ad319bd1ca530fe17442d02a97412eb75c7 Gerrit-Change-Number: 423 Gerrit-PatchSet: 4 Gerrit-Owner: stipa <lstipa...@gmail.com> Gerrit-Reviewer: d12fk <he...@openvpn.net> Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com> Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net> Gerrit-MessageType: merged
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
