From patchwork Sun Oct 18 22:28:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1383920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=merlin.20170209 header.b=3VmFbGaR; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OEOFobZS; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4CDvkS3p8zz9sSC for ; Mon, 19 Oct 2020 09:31:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=dXKX7MYNAqTNlrNcJn2G4tn6eRoEX974ax4uKoKHkKM=; b=3VmFbGaRy9m8ACCFN7eWesVqDS 5a0qXsSdGdpJ73ePYoXngRXlisFnmpzkJFVeMANbBFt0K7rySdA9LN2ndv2PYB2XbQTbTJThCEHa4 GtF32msaixwzaBFfcSyf5BhJXPFYp8chkDs4oFn5rikbQiLU0mBnEAGGTi0QaPEecu877sKTnlPrI 9aKSzM8msjACV+Jzg4d83M10o1NpKGxI49dWPG599SIk8CNNqQNdcS3lg+EeF1edz5LggcP1WI4hr 7pcf64HFZmzGhPM/1b5/zTPldUnX2s+7MwdV68nXN7h4wlG2wB4Wiidrl5I48VT84qOR2Kwp+hcuQ CRbHJ6Iw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUHAs-0000Fj-JW; Sun, 18 Oct 2020 22:29:10 +0000 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUHAq-0000Ey-3R for openwrt-devel@lists.openwrt.org; Sun, 18 Oct 2020 22:29:08 +0000 Received: by mail-ej1-x642.google.com with SMTP id a3so11218075ejy.11 for ; Sun, 18 Oct 2020 15:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tMaqXgAIAnuSW87QNo+W+0h+c9lR/dzprP1tXgkJpDk=; b=OEOFobZSYyebUZlrOIBvNYKoVL4Z5wcfUOuLt943ce0uTRS5SaXieUWG6OaozKclCG n/ykfn47WTJAFZOppa5CxEettjVTlUrCJOis4yfx1utaAnGtRFDvPPkd7jDooirMKHN9 0D9S/NElIoQekn7MddSh2CpFtyInt3oQWqICUyvzP8pTK+UyiBpas7uPloWdQwk+Xat0 QfKymQulYhwMwrpgck2fe/lC/JV5nwWjCbgH57WVDQ7GKnEJLZilEmC7bZwsQymWmXKb 1qsnNGjMaXwbeexjRCmB0BIA76Q/GtcPQgRFdpDpvo63lYgMRDyjcr1HXFsxaZggyzse iwjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tMaqXgAIAnuSW87QNo+W+0h+c9lR/dzprP1tXgkJpDk=; b=ntpM8SzQy55bnPj4Tyu5Ik96UPVVA6GO6AGDHLV9W0ZMVnZw00QPuuQZ4EkVdfeodC EgwCZrm5pJadaiYlfz016BV5dzf8+dZpUYgk5ix+q9cXScltMQa9oGsOcPYXwCDH40uv CVZ4CUUB8SXiX75yvAzeH/lAD0wQq2gofY5K84P39j4R+kZ5wGyPN33T3ZOBP9CIe5OI KzzACS1mvAPwenH9GRGDCLc4tSJxXCDtmt/GRyef9C0Uhmq+kTYA1QnOgM0tRWSSLcRG FWsJPkxjgLN1Hapg5HGxVD8cAnx7WT+kp02F+nM9+1SzaSxXiD7ROvpRvgx7BZVVHIP2 sOKw== X-Gm-Message-State: AOAM5303hBaoP1J9wRnqwTTOFxbkmaMj66ChBGEw7ov2LYM7fwH0Z5xY 3AGEujjKkf3m+NYORvQql9eoEeePHA== X-Google-Smtp-Source: ABdhPJz0yXcmyMRNiRvsYXXETbUekpZtF1cYi+uo28wztr9klO4uOFCfvKh4qK06NH1SFmHm8/HBMA== X-Received: by 2002:a17:906:b841:: with SMTP id ga1mr14310936ejb.29.1603060142969; Sun, 18 Oct 2020 15:29:02 -0700 (PDT) Received: from presler.lan (a95-93-121-164.cpe.netcabo.pt. [95.93.121.164]) by smtp.gmail.com with ESMTPSA id k26sm8406656ejq.13.2020.10.18.15.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Oct 2020 15:29:02 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] firewall3: fix duplicate defaults section detection Date: Sun, 18 Oct 2020 23:28:58 +0100 Message-Id: <20201018222858.238814-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201018_182908_180464_8E3F7AA1 X-CRM114-Status: GOOD ( 10.74 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) 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:642 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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 -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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The flag was initialised and tested, but actually never set when a duplicate section was found. Signed-off-by: Rui Salvaterra --- defaults.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/defaults.c b/defaults.c index 0580bfc..bd48958 100644 --- a/defaults.c +++ b/defaults.c @@ -151,6 +151,8 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p) continue; } + seen = true; + if(!fw3_parse_options(&state->defaults, fw3_flag_opts, s)) warn_elem(e, "has invalid options");