From: Lev Stipakov Date: Tue, 22 Sep 2020 10:00:21 +0000 (+0300) Subject: Alias ADAPTER_DOMAIN_SUFFIX to DOMAIN X-Git-Tag: v2.5_rc2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2062876f3a4c87a552ce5d7cb68113e349a5c872;p=thirdparty%2Fopenvpn.git Alias ADAPTER_DOMAIN_SUFFIX to DOMAIN ADAPTER_DOMAIN_SUFFIX is an openvpn3 replacement for DOMAIN, which is used there for split-dns. This option is pushed by modern Access Server. This change improves compatibility between OpenVPN community client and Access Server. Signed-off-by: Lev Stipakov Acked-by: Gert Doering Message-Id: <20200922100021.20329-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21107.html Signed-off-by: Gert Doering (cherry picked from commit d6720203fa9ba446497798a284c17093b92de1dc) --- diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vpn-network-options.rst index 825dd1caa..266827894 100644 --- a/doc/man-sections/vpn-network-options.rst +++ b/doc/man-sections/vpn-network-options.rst @@ -114,6 +114,10 @@ routing. :code:`DOMAIN` ``name`` Set Connection-specific DNS Suffix to :code:`name`. + :code:`ADAPTER_DOMAIN_SUFFIX` ``name`` + Alias to :code:`DOMAIN`. This is a compatibility option, it + should not be used in new deployments. + :code:`DOMAIN-SEARCH` ``name`` Add :code:`name` to the domain search list. Repeat this option to add more entries. Up to diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 4b22d3d93..3df803db9 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7440,7 +7440,8 @@ add_option(struct options *options, VERIFY_PERMISSION(OPT_P_IPWIN32); bool ipv6dns = false; - if (streq(p[1], "DOMAIN") && p[2]) + if ((streq(p[1], "DOMAIN") || streq(p[1], "ADAPTER_DOMAIN_SUFFIX")) + && p[2]) { o->domain = p[2]; }