[Openvpn-devel,1/4] remove foreign_option() call for IPv6 DNS servers

Message ID 20220527012457.1819262-2-heiko@ist.eigentlich.net
State Accepted
Headers show
Series [Openvpn-devel,1/4] remove foreign_option() call for IPv6 DNS servers | expand

Commit Message

Heiko Hund May 27, 2022, 1:24 a.m. UTC
The call survived since the initial commit 94bfc256d, where it was added
as a fallback, since no IPv6 DNS server handling was implemented at the
time. Now there's dhcp_option_dns6_parse() which adds the servers to the
tuntap options, just like how it is done with the v4 servers.

Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
---
 src/openvpn/options.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Gert Doering May 27, 2022, 8:19 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Indeed, this is inside an WIN32/ANDROID block, which does not need/use
foreign options for DHCP.  Out it goes.  Trivial otherwise :-)

Your patch has been applied to the master branch.

commit 2c4cf1a6490b875a4c666d781c30f1033f739118
Author: Heiko Hund
Date:   Fri May 27 03:24:54 2022 +0200

     remove foreign_option() call for IPv6 DNS servers

     Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220527012457.1819262-2-heiko@ist.eigentlich.net>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24433.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 20cc849d..65f4d889 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -7825,7 +7825,6 @@  add_option(struct options *options,
             if (strstr(p[2], ":"))
             {
                 ipv6dns = true;
-                foreign_option(options, p, 3, es);
                 dhcp_option_dns6_parse(p[2], o->dns6, &o->dns6_len, msglevel);
             }
             else