From patchwork Sat Sep 25 11:00:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Fertser X-Patchwork-Id: 1532665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: 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=B+sfeza3; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ms6Qi1ms; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HGmGs5h4Pz9sXk for ; Sat, 25 Sep 2021 21:03:31 +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=dAVQcUqMoualfw24aP+dQzlNE3K1gjAw7et3eaT9hnI=; b=B+sfeza30YG6DD xKn/PYH1/PRDyTrzM4BMx8I9fGdJoWn7L4zTvUvUuWDV1kbCkPotfekiX2/9VyF2o0d37uYQmLDGY ASUQhKfgml9ZSygPllokhklGJN6kkqLTCuP5lTJEuMMEziP7hh+jj+xlVka7peaPcn2Ss1HuL8jmP Q8377Mq0Bm8KbJj0CGKDH0yWBzFe2MaZjI3pNsxFW2FHZj9Oj6JeXizHIDQ3hc/+9wXtpsVyEGMqG OB7ZUTatUcAxGCnC7Wxwmo5agMUh2CxVY3nVuknJI/pS836tZVd1lSI9zad8cc90kFjD6RNdjQHt/ FMx1LrrRD1msPBTw5j3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mU5Q2-00GS2V-6U; Sat, 25 Sep 2021 11:00:34 +0000 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mU5Py-00GS29-T8 for openwrt-devel@lists.openwrt.org; Sat, 25 Sep 2021 11:00:32 +0000 Received: by mail-lf1-x134.google.com with SMTP id t10so51800297lfd.8 for ; Sat, 25 Sep 2021 04:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gSlOigrb0Ip6XipihkwDwHNwRrQWK/EZQ+2LauJoqMo=; b=ms6Qi1msWsLpQsSFBUhZaXcCwOESUGddqSmHt338V2eTe3iN+A2TpAPQSrP82tksiZ WQMutVyv5tsOMel4FN2eo6cIE/68uIXGiUX8NKiZ0vusZwTZYl/f/NLWnSGM1YK4JmFS 6v+3+r3r+huCCoXNZPLDgrdHOwKSnkbde+2FjRFo9vpCXTaZ1vWiyWBo6M2oGtehaR1U dzUqVY3GUt+EMOt7CN0rj/t3WGUzWACdPioVUTpD9pRiqyJ2xk+TzNqTxmdOSFkoMDB2 6Jij426X9bb9XvR2nW/LV962J0b7vHzBLNx0EgJL8Jgbm5LPXg4APN/y0vfvk/sH8Jya jriQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gSlOigrb0Ip6XipihkwDwHNwRrQWK/EZQ+2LauJoqMo=; b=KdCzvp+Z6xGwBiTIWNgm61J/b/O71N92VhgssIcVr4WD6H22QpQFlX5+OWZvkjP4gJ ognztyWd6tudYoj5icljmQx+UwsgobinBgyMyXjNoEk2+bRfBbgTbHSf8oiON6B23fBp X6PK4791/7NigrbI8rhf0laODupCLTDRyR2BjOUmFSZ1Fe62MGcA2/rxk7HZ7oeilmuT z8jni4c6UZNGbIvgXYGEdjOrUh9ig0h+4Fe8RyHFylVggS6D/e6cf74EYwE+EtMLwAZS V6ht6rD3kYnyqsQYQtEcHGR5icURTCrDtiHAWaX17mv7k/GDwRMIDW3ewTc5/eAdfDF1 Vgpw== X-Gm-Message-State: AOAM533eeuWEWhbJg/woe0jX9f+zaA6hwcBwwCJAuztJ7cwVibX2PP2P /Ppgh04LCcN4Ihv39pyyX9ngSX56Fsw= X-Google-Smtp-Source: ABdhPJwL7+F2YpSXQf6IjnzMe9PlqLgC/CM8+BRsgW4v/jQw/XbKhCic3kAOmncs7MpvzzW1P/8SZw== X-Received: by 2002:a2e:bd0f:: with SMTP id n15mr16267786ljq.504.1632567629177; Sat, 25 Sep 2021 04:00:29 -0700 (PDT) Received: from home.paul.comp (paulfertser.info. [2001:470:26:54b:226:9eff:fe70:80c2]) by smtp.gmail.com with ESMTPSA id f3sm1008480lfk.229.2021.09.25.04.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 04:00:28 -0700 (PDT) Received: from home.paul.comp (home.paul.comp [IPv6:0:0:0:0:0:0:0:1]) by home.paul.comp (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 18PB0PXk029984; Sat, 25 Sep 2021 14:00:26 +0300 Received: (from paul@localhost) by home.paul.comp (8.15.2/8.15.2/Submit) id 18PB0Pto029983; Sat, 25 Sep 2021 14:00:25 +0300 From: Paul Fertser To: openwrt-devel@lists.openwrt.org Cc: Paul Fertser Subject: [PATCH] dnsmasq: add explicit "set:" for client-matching options Date: Sat, 25 Sep 2021 14:00:23 +0300 Message-Id: <20210925110023.29943-1-fercerpav@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210925_040031_003728_82C69ED0 X-CRM114-Status: UNSURE ( 8.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", 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: Bring the usage in line with the dnsmasq man page and the other options where set: is mandatory. No functional change. Signed-off-by: Paul Fertser --- package/network/services/dnsmasq/files/dnsmasq.init | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:134 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [fercerpav[at]gmail.com] -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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Bring the usage in line with the dnsmasq man page and the other options where set: is mandatory. No functional change. Signed-off-by: Paul Fertser --- package/network/services/dnsmasq/files/dnsmasq.init | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index bea0bc02a2da..f000d5844bcb 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -241,7 +241,7 @@ dhcp_subscrid_add() { config_get subscriberid "$cfg" subscriberid [ -n "$subscriberid" ] || return 0 - xappend "--dhcp-subscrid=$networkid,$subscriberid" + xappend "--dhcp-subscrid=set:$networkid,$subscriberid" config_get_bool force "$cfg" force 0 @@ -257,7 +257,7 @@ dhcp_remoteid_add() { config_get remoteid "$cfg" remoteid [ -n "$remoteid" ] || return 0 - xappend "--dhcp-remoteid=$networkid,$remoteid" + xappend "--dhcp-remoteid=set:$networkid,$remoteid" config_get_bool force "$cfg" force 0 @@ -274,7 +274,7 @@ dhcp_circuitid_add() { config_get circuitid "$cfg" circuitid [ -n "$circuitid" ] || return 0 - xappend "--dhcp-circuitid=$networkid,$circuitid" + xappend "--dhcp-circuitid=set:$networkid,$circuitid" config_get_bool force "$cfg" force 0 @@ -290,7 +290,7 @@ dhcp_userclass_add() { config_get userclass "$cfg" userclass [ -n "$userclass" ] || return 0 - xappend "--dhcp-userclass=$networkid,$userclass" + xappend "--dhcp-userclass=set:$networkid,$userclass" config_get_bool force "$cfg" force 0 @@ -307,7 +307,7 @@ dhcp_vendorclass_add() { config_get vendorclass "$cfg" vendorclass [ -n "$vendorclass" ] || return 0 - xappend "--dhcp-vendorclass=$networkid,$vendorclass" + xappend "--dhcp-vendorclass=set:$networkid,$vendorclass" config_get_bool force "$cfg" force 0 @@ -323,7 +323,7 @@ dhcp_match_add() { config_get match "$cfg" match [ -n "$match" ] || return 0 - xappend "--dhcp-match=$networkid,$match" + xappend "--dhcp-match=set:$networkid,$match" config_get_bool force "$cfg" force 0