[Openvpn-devel,v1] openvpnserv: check DhcpNameServer lookup in GetItfDnsServersV4()

Message ID 20261103184453.9550-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] openvpnserv: check DhcpNameServer lookup in GetItfDnsServersV4() |

Commit Message

Gert Doering Nov. 3, 2026, 6:44 p.m. UTC
  From: Razvan Cojocaru <razvanc@mailbox.org>

The RegGetValueA() result for DhcpNameServer was discarded and the
error from the earlier NameServer lookup was tested instead. With no
NameServer value, err was still ERROR_FILE_NOT_FOUND, so the DHCP
fallback always failed.

Broken since 0f3b7d17 ("win: implement --dns option support with
NRPT").

Change-Id: I9eb4b74b53d680c160b8ac65ab844f6404431e62
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2109
---

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/+/2109
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>
  

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 484f27c..4a8d0b5 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2151,7 +2151,7 @@ 
     if (!strchr(addrs, '.') && IsDhcpEnabled(itf_key))
     {
         s = *size;
-        RegGetValueA(itf_key, NULL, "DhcpNameServer", RRF_RT_REG_SZ, NULL, (PBYTE)addrs, &s);
+        err = RegGetValueA(itf_key, NULL, "DhcpNameServer", RRF_RT_REG_SZ, NULL, (PBYTE)addrs, &s);
         if (err)
         {
             *size = 0;