From patchwork Tue Jul 8 18:52:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4300 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:3846:b0:671:5a2c:6455 with SMTP id n6csp7820213mal; Tue, 8 Jul 2025 11:52:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9JAsItc+6Bf0NdA7grqck7KBau8WiCbxGiNQC7tIpE9xSmOoSwh0E0+q8dPdLWMsYFS8JgS/G3lU=@openvpn.net X-Google-Smtp-Source: AGHT+IH0XJbPPSSFrNRessRSlCW529W5VyQbNcMSK6Gn0bxIV9HMw9u2D/7gckb//NTbbFnjhCh3 X-Received: by 2002:a05:6870:61d4:b0:2df:5323:520b with SMTP id 586e51a60fabf-2fef185b4b3mr659920fac.19.1752000750643; Tue, 08 Jul 2025 11:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1752000750; cv=none; d=google.com; s=arc-20240605; b=NfFEPM7Lw7h6LxWmf6eg4er8qLYJWUmeQi8T5uRzACf77gMuVOS/1q+YlYBKo/nuUR 2NRBjd6WokaK57ADgOF4b7wpjMZoudCrUQRaAOhnIRr7d+Mc0ikriz6xwILQFPkGw1FQ B2lkh/tEJnLNnWDoMdFIJPslmkSaBm3L8kKmHivfK0VYAomkTWdQ+nFBLe2I80mX6M/h Z86sDhj4+08FLOOHGnaWvr/WPwXeLFrB6Azbih+ebT9TKphD/KFFfwOJfL0NGoIhh9WN lcZwfpx0fgXpHBpj6Xd39Wi24G0btwCg/FKkaLtNWkM2LsQMxbzj11wkgUEXO6PUpuDN Yl2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=lRj56TwF6GHYqCtqLu0e5BBITo/SjZTjhB/SF7/fnuI=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=iJzpNfsw/klrldHQmoV9qXvyjuzgUOfqSE0ytRL+e5XvB7CkVdBbfCgWZ8wG5Ynm1Z JY7PyttO9Q3dp8iiygr85t1m4NYD1b5ysG+ZEfZCSEieyQlfqRHHu0EWF4DNq6Bo9Tkn JDWMPX1MlJssW+uiuVbWtTxiP5mFc7XbHNR9EvrPbavhKmqHlFq9y2qKqZ/KC0pbz/6z OV2NRYArXZhgp58puwB07CtDT5UwFN8NiHetoJG9Rl9m2TGdOGnh/CCrH+cO0zMM5eb3 zSHBIL+Mx52s1Yk6k6fmT4sCcj5s4RVjXvMxJWr1IiOUDseBFJiQepBVXocXGoOxfaaR pJVg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=gwB8Fcxo; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Gdsc06ar; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Pbn9/H1c"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-2f7900b0635si8092379fac.153.2025.07.08.11.52.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2025 11:52:30 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=gwB8Fcxo; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Gdsc06ar; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Pbn9/H1c"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lRj56TwF6GHYqCtqLu0e5BBITo/SjZTjhB/SF7/fnuI=; b=gwB8FcxoZyywvezTwBzK2ttN3/ PUsSjHHTaPyzA2SrC9HERsLFHrhKcDwlsqZDQ1YPjfppCJ3SedA5lSgiXE9157h3Jb50iu0ZtsfVW njHTqovOlLwZax3fInB2875+z9/VDJtrfFGKQChBfm8x96Dnv0wyX2ExyCQ9z5L0qqag=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1uZDQX-0001lD-Cs; Tue, 08 Jul 2025 18:52:25 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1uZDQW-0001l3-OS for openvpn-devel@lists.sourceforge.net; Tue, 08 Jul 2025 18:52:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4hK7Bk4SfbAvHfpSMKJe2TFRd+HoVE48XB66mHVxh6I=; b=Gdsc06arP+gQTXm9iRxEBxXHqb S5k4JXZM9OdcZgb82qmvRuGIIK8itPN9K+XOKL2VjYQZSMYkwg7GsAHErFU5WvUxHuTbvX53e/hBT 9nD7Aogi5jC2wCtfUBt7FVNi+3D6Do6pBZbrMaTeOQ7pDKgAMvKlCjvb/ileR71ZZUI0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=4hK7Bk4SfbAvHfpSMKJe2TFRd+HoVE48XB66mHVxh6I=; b=Pbn9/H1c8bqLBMN/62hpQlzMd1 pFlpAohg4wK63CSpF6CzRS0iBBF7sm0s3VPsWtBtoYesC5XEm8UkUDYma4ijdqSXlEL+jY1/nelI/ KGnIDcO4iO30Vx8T87T5Bd3cUPquwh3GQcW2Kt8CzyxF3ndSE+JmnXembnBlsiTj0bO0=; Received: from [193.149.48.143] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1uZDQV-0004r4-Jg for openvpn-devel@lists.sourceforge.net; Tue, 08 Jul 2025 18:52:24 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 568IqBoQ030455 for ; Tue, 8 Jul 2025 20:52:11 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 568IqBXC030454 for openvpn-devel@lists.sourceforge.net; Tue, 8 Jul 2025 20:52:11 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 8 Jul 2025 20:52:04 +0200 Message-ID: <20250708185210.30421-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Heiko Hund Running the script doesn't make sense with the AFUNIX dev node, so we simply clear any scripts that have been set before. Change-Id: I7e9a0c668e0950257632452cfd9eeb236f0120f2 Signed-off-by: Heiko Hund Acked-by: Arne Schwabe --- Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_DNSWL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#DnsBlocklists-dnsbl-block for more information. [193.149.48.143 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. [URI: openvpn.net] 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1uZDQV-0004r4-Jg Subject: [Openvpn-devel] [PATCH v2] dns: do not run updown scripts with lwipovpn 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 X-GMAIL-THRID: =?utf-8?q?1837105939103750721?= X-GMAIL-MSGID: =?utf-8?q?1837105939103750721?= From: Heiko Hund Running the script doesn't make sense with the AFUNIX dev node, so we simply clear any scripts that have been set before. Change-Id: I7e9a0c668e0950257632452cfd9eeb236f0120f2 Signed-off-by: Heiko Hund Acked-by: Arne Schwabe --- 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/+/1077 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/src/openvpn/options.c b/src/openvpn/options.c index af097f8..0662b49 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -61,6 +61,7 @@ #include "xkey_common.h" #include "dco.h" #include "options_util.h" +#include "tun_afunix.h" #include @@ -3593,6 +3594,13 @@ struct gc_arena gc = gc_new(); struct dns_options *dns = &o->dns_options; + if (is_tun_afunix(o->dev_node)) + { + /* Disable running dns-updown script with lwipovpn */ + dns->updown_flags = DNS_UPDOWN_NO_FLAGS; + dns->updown = NULL; + } + if (dns->servers || dns_updown_user_set(dns) || dns_updown_forced(dns)) { /* Clean up env from --dhcp-option DNS config */