From patchwork Fri Feb 5 03:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viktor Oreshkin X-Patchwork-Id: 1593 X-Patchwork-Delegate: davids@openvpn.net Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id UKw2CW1dHWAkRwAAIUCqbw (envelope-from ) for ; Fri, 05 Feb 2021 09:59:57 -0500 Received: from proxy5.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id KID5CG1dHWDaUwAAalYnBA (envelope-from ) for ; Fri, 05 Feb 2021 09:59:57 -0500 Received: from smtp21.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.iad3b.rsapps.net with LMTPS id SEUlAm1dHWAPWQAA13hMnw (envelope-from ) for ; Fri, 05 Feb 2021 09:59:57 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp21.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=stek29.rocks; dkim=fail (signature verification failed) header.d=stek29.rocks; dmarc=none (p=nil; dis=none) header.from=stek29.rocks X-Suspicious-Flag: YES X-Classification-ID: cec11bb0-67c2-11eb-a3bf-525400cdc90a-1-1 Received: from [216.105.38.7] ([216.105.38.7:47032] helo=lists.sourceforge.net) by smtp21.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id D5/24-17157-C6D5D106; Fri, 05 Feb 2021 09:59:56 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1l82Zc-0005wI-R4; Fri, 05 Feb 2021 14:59:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82Zc-0005wB-4s for openvpn-devel@lists.sourceforge.net; Fri, 05 Feb 2021 14:59:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:To:Subject:Message-ID:Date:From: MIME-Version:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nL1U9n9MmImhVNcYl0rcYr6rRwe+uue6mbZa3ZCFLSs=; b=iSgAdfhDuqLdV6yGxbxxpfuaoh +6t06QXAquZETuAvl1JiGeVPLNhim2juA+rY2qW7+QgXcK2zs5zrkEF7wmXGoQ8hQxpNLKr9T5JEa beUGd7iGcRMCethE4/Cq7XaecoyU8AJy0QeYV7Py4t581WrZzgLEI8lwRKY4OA5B4+ns=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:To:Subject:Message-ID:Date:From:MIME-Version:Sender:Reply-To :Cc:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=nL1U9n9MmImhVNcYl0rcYr6rRwe+uue6mbZa3ZCFLSs=; b=W B0J0JATsj78nvmJqFJmz7zpFij70TqTqcKFwtKwNfMENOhkyNriJ49/iqrQeV1rIc/YpoLQtA7FWH zoz2sLanfGbmyZPHCM+v0EhLxJlNQ/gU5IcwZfVRNxe6zl9JuAkdRh+0I4rlyoETxMx55JQ3ErPzi Puzcn+XbigR8NYZA=; Received: from fallback15.mail.ru ([94.100.179.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1l82ZQ-0002Be-TK for openvpn-devel@lists.sourceforge.net; Fri, 05 Feb 2021 14:59:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=stek29.rocks; s=mailru; h=Content-Type:To:Subject:Message-ID:Date:From:MIME-Version; bh=nL1U9n9MmImhVNcYl0rcYr6rRwe+uue6mbZa3ZCFLSs=; b=eqIwaJ5/CfDMyCu2aeivrhoxtx0g2ls9j8U7ejcezBp2ibmjEA4xO+MUlv20KuLW63rzg8Y34GVOyhW3/ay5JRS7eC7L1qn39a7xZHd9ui/gzf5xGDdQn26SUzKIAHd0y3/luTs81iznJmC0yBw8dXNmt+0RZZlJbXzXJSnhFwc=; Received: from [10.161.64.52] (port=58424 helo=smtp44.i.mail.ru) by fallback15.m.smailru.net with esmtp (envelope-from ) id 1l82Bt-0002NP-Rw for openvpn-devel@lists.sourceforge.net; Fri, 05 Feb 2021 17:34:34 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=stek29.rocks; s=mailru; h=Content-Type:To:Subject:Message-ID:Date:From:MIME-Version:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=nL1U9n9MmImhVNcYl0rcYr6rRwe+uue6mbZa3ZCFLSs=; b=lBpaaPIbzyS5h6lFqVhsbpk9hJ80i8FihD475TUcw3gd1y3RCZSyxHLtyocIZnGuLsg4CukZ810S8Mor+VUFalf8aN1rLOe7XEjLj1NWfaNnCnCC51eSqJBBcyM8gmO4EH1efVgRN7Y93e5ZA/tFYh/EPSjxxRBCBOAQWpiEVMo=; Received: by smtp44.i.mail.ru with esmtpa (envelope-from ) id 1l82Bm-00061H-Gr for openvpn-devel@lists.sourceforge.net; Fri, 05 Feb 2021 17:34:26 +0300 Received: by mail-wr1-f42.google.com with SMTP id b3so7917498wrj.5 for ; Fri, 05 Feb 2021 06:34:26 -0800 (PST) X-Gm-Message-State: AOAM532suFE+NEeAy3dZKEpS65U0EoLKhQH9VIzk2QcWcVjL5BV6RaBk 3b0X5jNP1H427pewkXbqlXZoxljrsGwSuGt/XWk= X-Google-Smtp-Source: ABdhPJy3ey5RkE5OiHeeBSLxhm7y4H43/I62AB1JM8DpRlGJu1VLrgg+nltV9PPj20vZs6kj+4ooVIt+RI0EhemvKBc= X-Received: by 2002:a5d:4383:: with SMTP id i3mr5364512wrq.293.1612535665990; Fri, 05 Feb 2021 06:34:25 -0800 (PST) MIME-Version: 1.0 From: Viktor Oreshkin Date: Fri, 5 Feb 2021 17:34:14 +0300 X-Gmail-Original-Message-ID: Message-ID: To: openvpn-devel@lists.sourceforge.net X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD953AC099BC0052A9C55152E5B36F7009490E3DBC75EBFD4CE182A05F538085040A9C782A9B0F4A4616B6141BE33FA6EA94B47AE771DD5F518636880E125D33F3C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B9FBA884A7C9B8BAEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637976142D429C486548638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCBEB4BB7275C87FD89F9AB4BB957F243D4A38F810F48F63DA389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A3E989B1926288338941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6D6FBC3EC642A93BBCC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249FEB35675F57C729276E601842F6C81A12EF20D2F80756B5F7E9C4E3C761E06A776E601842F6C81A127C277FBC8AE2E8BDA85BAAA8A9E647C3AA81AA40904B5D9DBF02ECDB25306B2B25CBF701D1BE8734AD6D5ED66289B5278DA827A17800CE7672035D22F879DF567F23339F89546C5A8DF7F3B2552694A6FED454B719173D6725E5C173C3A84C3FAF59672226B6DF735872C767BF85DA2F004C906525384306FED454B719173D6462275124DF8B9C9AE7E30DF62CE24E4E5BFE6E7EFDEDCD789D4C264860C145E X-C1DE0DAB: 8BD88D57C5CADBC8B2710865C386751094C72BDDC9A8ED5CA3B1A56EE2B804F6B226C914C996894645FD9D8A29397D6EFF55FE49A3C2BFCFC8C84E951CD0BE2F296C473AB1E14218EA052B563B0B06C67866D6147AF826D8C030339F986766A7DE3A04686193F0A1F972CCD2F8FE1EF1CFC4036BBF6A4EA91D7B6CCDEC98EA79CB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3458239C6F30CE7ACFFEF341B39868EF6E90730C5002271DD8BCE80C7CB1A6DCAABACBF2F7D61251FA1D7E09C32AA3244CE142C5EC50CFA1F3D58FE4A9DB55CD553A76366E8A9DE7CA3EB3F6AD6EA9203E X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQDytKvZo6Vv110HtxCSFvw== X-Mailru-Sender: 4C235FE2E5D2D89053CEB63C86401F87370104A00129037DCA8B714F76E87E6742ACCDA72356272B45BB25921E49D806594FB4C9F0DBF41295729423737FA70EA3290F26D8A4A07522C92DDBE19BAF6767EA787935ED9F1B X-Mras: Ok X-7564579A: B8F34718100C35BD X-77F55803: 6242723A09DB00B429696F2DCEDD653A3882F69B6077407EBDC0DA2038A6E990049FFFDB7839CE9E2C56D468AE39A59DCEBBC11FB377E1D90A5CDF39EFBA40D29F35B4A8758A76B3 X-7FA49CB5: 0D63561A33F958A5246C549DA1E0A84FC16CB40DECB9A7A39980C1284D9181A58941B15DA834481FA18204E546F3947CEBAEFC6015046CFCF6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F790063749305D2801D13566389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F79006373A26EF7B598AE194D81D268191BDAD3DBD4B6F7A4D31EC0BEA7A3FFF5B025636A7F4EDE966BC389F9E8FC8737B5C2249E3B2F4CB3D1ABDA4089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A39223F8577A6DFFEA7C52A781257067E9B843847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148F3545B7F30541B7742623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 8BD88D57C5CADBC8B2710865C386751094C72BDDC9A8ED5CA3B1A56EE2B804F6B226C914C996894645FD9D8A29397D6EFF55FE49A3C2BFCFC8C84E951CD0BE2F296C473AB1E14218EA052B563B0B06C67866D6147AF826D8658A3D9E56772A89503DA5FE5F5DCE67F972CCD2F8FE1EF1CFC4036BBF6A4EA91D7B6CCDEC98EA79CB5012B2E24CD356 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQDytKvZo6Vvj8eaobqXvHQ== X-Mailru-MI: 1000 X-Mailru-Sender: A5480F10D64C9005265567A7F4CD7519585C0955C6E664D58586D3136CF4675B8A2AC75D222269F8EF0DF1ECA7217D83D7A14DD9E34ECE7437A568727BC09F391ADA9481F42D98BEAFB3565D5F68211A3453F38A29522196 X-Mras: Ok X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [94.100.179.50 listed in list.dnswl.org] 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: stek29.rocks] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1l82ZQ-0002Be-TK Subject: [Openvpn-devel] [PATCH 1/1] openvpn3: tunprop.hpp: handle dhcp-option DOMAIN-SEARCH X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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 --- openvpn/tun/client/tunprop.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) for (size_t j = 2; j < o.size(); ++j) 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);