diff mbox series

[Openvpn-devel,v2] Use correct undo_list when clearing DNS addresses

Message ID 20251103212523.31409-1-gert@greenie.muc.de
State Accepted
Headers
Series [Openvpn-devel,v2] Use correct undo_list when clearing DNS addresses |

Commit Message

Gert Doering Nov. 3, 2025, 9:25 p.m. UTC 
  From: Selva Nair <selva.nair@gmail.com>

Reported by: <aarnav@srlabs.de>

Change-Id: Iafac2b8f319457de8e36b427f26ebc27c040c6f7
Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1344
---

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

Acked-by according to Gerrit (reflected above):
Lev Stipakov <lstipakov@gmail.com>

Comments

Gert Doering Nov. 4, 2025, 8:12 a.m. UTC | #1 
Thanks.  I do wonder how this could have worked so long without anyone
noticing...

Your patch has been applied to the master and release/2.6 branch (bugfix).

The patch would apply to release/2.5 as well, but since we don't provide
windows installer releases for 2.5.x anymore I'm not sure it's worth it.

commit 59fed2ad127bda2986f4c70d128453740ca63d34 (master)
commit 21d6b663d3a4370348d5cd071ba2207dc63f0c9f (release/2.6)
Author: Selva Nair
Date:   Mon Nov 3 22:25:17 2025 +0100

     Use correct undo_list when clearing DNS addresses

     Signed-off-by: Selva Nair <selva.nair@gmail.com>
     Acked-by: Lev Stipakov <lstipakov@gmail.com>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1344
     Message-Id: <20251103212523.31409-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34171.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 58f1e02..0712986 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -1797,7 +1797,7 @@ 
 HandleDNSConfigMessage(const dns_cfg_message_t *msg, undo_lists_t *lists)
 {
     DWORD err = 0;
-    undo_type_t undo_type = (msg->family == AF_INET6) ? undo_dns4 : undo_dns6;
+    undo_type_t undo_type = (msg->family == AF_INET6) ? undo_dns6 : undo_dns4;
     int addr_len = msg->addr_len;
 
     /* sanity check */