Message ID | 20240905175019.2443574-1-niklas.soderlund@ragnatech.se |
---|---|
State | New |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=y9/iHkHJ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ragnatech.se header.i=@ragnatech.se header.a=rsa-sha256 header.s=fm3 header.b=jYpv0g62; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm1 header.b=av9CwLr4; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X06Nx62r0z1yfv for <incoming@patchwork.ozlabs.org>; Fri, 6 Sep 2024 03:51:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Mzp53+PlG7u9hRFZ3+TlAMWxxOBysrYHR//qv9zmT9M=; b=y9/iHkHJiqrnA+ ssnFR2jAc/3wHrWIBigVKLPuzw/R12SkVfmUk+Tx19/kYnwu0ElH0G0j6Qidn/UmsIX5l7gPRB13I tcyOBZZJKpVnG/IRIlCgT2cY4RhrJIPcKVHZFXG71H4gB3cuSQ7V3tCx7L/ol1yv2irxy0Z/xYOW+ F7uv0uNw2aaNFxpTgoG9yA3RZuvD3SomkMg23V4o5iEEc27btnp7qv3ZbO2kxSFnyylLXtUJgijpM Uwj0CNa7Kcrpq567R5Byrc5xgf+swANQkEmW6KqOvipxNhUBcja1uD8SK2rJ/B+PqAW/6slQ4TGsV G7tPsxHCIgOeWtvp+yXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1smGck-00000009LDN-1Z1O; Thu, 05 Sep 2024 17:50:26 +0000 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smGch-00000009LCA-3Yfg for openwrt-devel@lists.openwrt.org; Thu, 05 Sep 2024 17:50:25 +0000 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 96F1911401B8; Thu, 5 Sep 2024 13:50:22 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Thu, 05 Sep 2024 13:50:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech.se; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1725558622; x=1725645022; bh=4v gCpVoOkPLw32JQDq4btT7bH6+vEATwqEaZhH9p2Wc=; b=jYpv0g62mXTIZZ8+pn lzVWImhSPFsgCIpMYT6neuFk7X4397kU2xskVIu5QYDzDVS9X2jlU1ZbqII/D6+S 5dujCGdkeTDq+JHvOcuPs73AFmek55zFetLpshzIYbSIyZzkfnfUhl75lB5bh/8O +Ct4RTXmFgixUYBbvBrPGYLIs9r16zBd4FrmwX5DTbRKxjE+lB3oEoEVd1LVcMpA Nm8KQYQVZUyMk1Czq03fbATTZSoy7Y6ndiF5kiowfueQCswDdKIMzeDx4RZUZDAz nvf13BaCvf2M5uw6/xF0tKo9ri5HuvAfgK0+1dzFZHHgX/nbXA+yfij323kSaug5 qBtg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1725558622; x=1725645022; bh=4vgCpVoOkPLw3 2JQDq4btT7bH6+vEATwqEaZhH9p2Wc=; b=av9CwLr4kL9qbteZjSir7+uJ4+Jqq sznrzc4W6ur8UWPl+T2NaNW3pKKM5KSnuTFlyKo+r6+YoFFtlk4t81P/3jRiG9vg 4hhBAkmnvPY4oZonIpBXNLqVgL6CNXsotEpW0rJcS5Ys9NAqEAbIHz2YSlyaI3Wy KGKvhxvdxUxPRY1ZNe45ACiyXyUTLDZT9Xw8vLOCn+qS/n66OEDUrBiOG48d11Nz 4t3NepYdrMGf0VkLnPxIzK12dSqGxe9j8+6u1N3LGvvFhHyV6GFAgFshH8Eb095X p7/MEn1niyNkNlfJXOJn4uhZ39RCa0PWsGArgL16fUmrzQ2kt36XZu5RQ== X-ME-Sender: <xms:Xu_ZZtq5U3xA0_WahO1FG7eJmKxVKYXUa-x3gguMo3vgeyTquPIW6A> <xme:Xu_ZZvoZjtGhZftDO6Hm6wbaodtqbRB8ecrgAH4XviVcn7Rj6Uu5nvI2PisUac2AZ KJUOvbp6Y5FPKQSXlA> X-ME-Received: <xmr:Xu_ZZqMDsJqFAwEHTrPWwN9RZuVxBLpAMUKUaBm4g5glusudLkflHfZXtmd3N8wQwKmfCLAsE6Qm2jKUaKVBusiuAQ> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehledguddujecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihhklhgrshcuufpnuggvrhhl uhhnugcuoehnihhklhgrshdrshhouggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvqe enucggtffrrghtthgvrhhnpedttdfhgeffveevgeekteegleegtdeltefhgfeuveffffei gefggfejfeehjeevkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehnihhklhgrshdrshhouggvrhhluhhnugesrhgrghhnrghtvggthhdrshgv pdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehoph gvnhifrhhtqdguvghvvghlsehlihhsthhsrdhophgvnhifrhhtrdhorhhgpdhrtghpthht ohepnhhikhhlrghsrdhsohguvghrlhhunhgusehrrghgnhgrthgvtghhrdhsvg X-ME-Proxy: <xmx:Xu_ZZo5qXfm1XeeWDDXlV3VJZKphCn7i42jo2XiHKUGg2g4BzUBf3g> <xmx:Xu_ZZs62rbUNGQl7UiMbrxNKiRKWFd2cwcxu6Clq4QhuhyGrxzYMKw> <xmx:Xu_ZZgiGAhi9Iz52KjycIW1OvXfQm0A-B81o8jMjAH1k5riiomjV3w> <xmx:Xu_ZZu7Se2-vdrE3plMY5r8DanSuOH18PQmMlIutwE8cg1kCrCWTyg> <xmx:Xu_ZZsGPf2r-qB6QHooNoUerpO8ZC-FlvaENcVZcJ4dmeQo7jJmPOW5A> Feedback-ID: i80c9496c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Sep 2024 13:50:22 -0400 (EDT) From: =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se> To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se> Subject: [PATCH] dnsmasq: Make more use of append_addnhosts Date: Thu, 5 Sep 2024 19:50:19 +0200 Message-ID: <20240905175019.2443574-1-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240905_105024_052182_35FF856B X-CRM114-Status: UNSURE ( 6.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.8 (--) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__Instead_of_duplicating_the_code_around?= =?unknown-8bit?q?_--addn-hosts_make_use?= =?unknown-8bit?q?_of_the_existing_wrapper_function=2E_Signed-off-by=3A_Nikla?= =?unknown-8bit?q?s_S=C3=B6derlund_=3Cniklas=2Esoderlund=40ragnatech=2Ese=3E?= =?unknown-8bit?q?_---_package/network/services/dnsmasq/files/dnsmasq=2Einit_?= =?unknown-8bit?q?=7C_6_++----_1_file?= =?unknown-8bit?q?_changed=2C_2_insertions=28+=29=2C_4_deletions=28-=29_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-2=2E8_points=2C_5=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E7_RCVD=5FIN=5FDNSWL=5FLOW______RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_low?= =?unknown-8bit?q?_trust?= =?unknown-8bit?q?_=5B103=2E168=2E172=2E153_listed_in_list=2Ednswl=2Eorg=5D?= =?unknown-8bit?q?_-0=2E0_SPF=5FHELO=5FPASS__________SPF=3A_HELO_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from_author=27s?= =?unknown-8bit?q?_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?unknown-8bit?q?_-1=2E9_BAYES=5F00_______________BODY=3A_Bayes_spam_probabi?= =?unknown-8bit?q?lity_is_0_to_1=25?= =?unknown-8bit?q?_=5Bscore=3A_0=2E0000=5D?= =?unknown-8bit?q?_0=2E0_RCVD=5FIN=5FVALIDITY=5FSAFE=5FBLOCKED_RBL=3A_ADMINIS?= =?unknown-8bit?q?TRATOR_NOTICE=3A_The_query_to?= =?unknown-8bit?q?_Validity_was_blocked=2E__See?= =?unknown-8bit?q?_https=3A//knowledge=2Evalidity=2Ecom/hc/en-us/articles/209?= =?unknown-8bit?q?61730681243?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5B103=2E168=2E172=2E153_listed_in_sa-accredit=2Ehabeas=2E?= =?unknown-8bit?q?com=5D?= =?unknown-8bit?q?_0=2E0_RCVD=5FIN=5FVALIDITY=5FCERTIFIED=5FBLOCKED_RBL=3A_AD?= =?unknown-8bit?q?MINISTRATOR_NOTICE=3A_The?= =?unknown-8bit?q?_query_to_Validity_was_blocked=2E__See?= =?unknown-8bit?q?_https=3A//knowledge=2Evalidity=2Ecom/hc/en-us/articles/209?= =?unknown-8bit?q?61730681243?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5B103=2E168=2E172=2E153_listed_in_sa-trusted=2Ebondedsend?= =?unknown-8bit?q?er=2Eorg=5D?= =?unknown-8bit?q?_-0=2E0_T=5FSCC=5FBODY=5FTEXT=5FLINE___No_description_avail?= =?unknown-8bit?q?able=2E?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FMSPIKE=5FH2______RBL=3A_Average_reputat?= =?unknown-8bit?q?ion_=28+2=29?= =?unknown-8bit?q?_=5B103=2E168=2E172=2E153_listed_in_wl=2Emailspike=2Enet=5D?= =?unknown-8bit?q?_0=2E0_RCVD=5FIN=5FVALIDITY=5FRPBL=5FBLOCKED_RBL=3A_ADMINIS?= =?unknown-8bit?q?TRATOR_NOTICE=3A_The_query_to?= =?unknown-8bit?q?_Validity_was_blocked=2E__See?= =?unknown-8bit?q?_https=3A//knowledge=2Evalidity=2Ecom/hc/en-us/articles/209?= =?unknown-8bit?q?61730681243?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5B103=2E168=2E172=2E153_listed_in_bl=2Escore=2Esenderscor?= =?unknown-8bit?q?e=2Ecom=5D?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
dnsmasq: Make more use of append_addnhosts
|
expand
|
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 4cfb1554240b..fb061dceed6c 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1006,11 +1006,9 @@ dnsmasq_start() } config_get_bool ignore_hosts_dir "$cfg" ignore_hosts_dir 0 if [ "$ignore_hosts_dir" = "1" ]; then - xappend "--addn-hosts=$HOSTFILE" - append EXTRA_MOUNT "$HOSTFILE" + append_addnhosts "$HOSTFILE" else - xappend "--addn-hosts=$HOSTFILE_DIR" - append EXTRA_MOUNT "$HOSTFILE_DIR" + append_addnhosts "$HOSTFILE_DIR" fi config_list_foreach "$cfg" "addnhosts" append_addnhosts config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
Instead of duplicating the code around --addn-hosts make use of the existing wrapper function. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> --- package/network/services/dnsmasq/files/dnsmasq.init | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)