Message ID | CAGtGfm=9TEUDohP4LUDY+NDLAmad60sb=VRXC9AvHthK=UMDTQ@mail.gmail.com |
---|---|
State | Accepted |
Delegated to: | David Sommerseth |
Headers | show |
Series | [Openvpn-devel,1/1] openvpn3: tunprop.hpp: handle dhcp-option DOMAIN-SEARCH | expand |
On 05/02/2021 15:34, Viktor Oreshkin wrote: > Adds support for dhcp-option DOMAIN-SEARCH, which was added to OpenVPN 2 > in release 2.5 > > fixes https://github.com/OpenVPN/openvpn3/issues/145 > <https://github.com/OpenVPN/openvpn3/issues/145> > > URL: https://github.com/OpenVPN/openvpn3/pull/146 > <https://github.com/OpenVPN/openvpn3/pull/146> > Signed-off-by: Viktor Oreshkin <imselfish@stek29.rocks> Hi, Thanks a lot. This has been reviewed and merged into OpenVPN 3 git master. commit 67172a582c1598f1e30fbd3a246251d60618416c Author: Viktor Oreshkin <me@stek29.rocks> Date: Fri Feb 5 17:34:14 2021 +0300 tunprop.hpp: handle dhcp-option DOMAIN-SEARCH Adds support for dhcp-option DOMAIN-SEARCH, which was added to OpenVPN 2.5.0. URL: https://github.com/OpenVPN/openvpn3/issues/145 URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21554.html Message-Id: <CAGtGfm=9TEUDohP4LUDY+NDLAmad60sb=VRXC9AvHthK=UMDTQ@mail.gmail.com> Signed-off-by: Viktor Oreshkin <imselfish@stek29.rocks>
diff --git a/openvpn/tun/client/tunprop.hpp b/openvpn/tun/client/tunprop.hpp index d9f20f85445b..3e7ab8eab54b 100644 --- a/openvpn/tun/client/tunprop.hpp +++ b/openvpn/tun/client/tunprop.hpp @@ -523,7 +523,7 @@ namespace openvpn { throw tun_prop_dhcp_option_error("tun_builder_add_dns_server failed"); flags |= F_ADD_DNS; } - else if (type == "DOMAIN") + else if (type == "DOMAIN" || type == "DOMAIN-SEARCH") { o.min_args(3);
Adds support for dhcp-option DOMAIN-SEARCH, which was added to OpenVPN 2 in release 2.5 fixes https://github.com/OpenVPN/openvpn3/issues/145 URL: https://github.com/OpenVPN/openvpn3/pull/146 Signed-off-by: Viktor Oreshkin <imselfish@stek29.rocks> --- openvpn/tun/client/tunprop.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) for (size_t j = 2; j < o.size(); ++j)