From 0acba3cc64064841224f7ea4484e4d9715a42897 Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Wed, 15 Nov 2023 13:06:23 +0100 Subject: [PATCH] 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 Acked-by: Frank Lichtenheld Message-Id: <20231115120623.6442-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27402.html Signed-off-by: Gert Doering (cherry picked from commit 60def50420b050e628f4388e3c9ff771eb70a549) --- src/openvpn/options.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 895ce830f6a..9502982546f 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1372,6 +1372,7 @@ tuntap_options_copy_dns(struct options *o) { 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 @@ tuntap_options_copy_dns(struct options *o) { 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) */