From patchwork Thu Apr 1 12:50:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Marx X-Patchwork-Id: 4011 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FB32S5GQbz3ws3 for ; Thu, 1 Apr 2021 12:50:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FB32Q1Cw2z1Wl; Thu, 1 Apr 2021 12:50:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FB32P494rz2xGX; Thu, 1 Apr 2021 12:50:53 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FB32N1CzXz2xGX for ; Thu, 1 Apr 2021 12:50:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FB32M6zkjzgy; Thu, 1 Apr 2021 12:50:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1617281452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7x3Yv9NzhVpZvaExfw6EQEoTupNb3f6fA7u1rlclOUs=; b=OBVppZiWWawv1B5kCnevmAdfPPBCgC18RHjDlR0Ax21d8zD2MBPOyJpk8opk24VE1hrmPC +yClGDqaar9h2xDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1617281452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7x3Yv9NzhVpZvaExfw6EQEoTupNb3f6fA7u1rlclOUs=; b=tgc1ywz8Mg9oH1k1Fubdv4GcGmqbsQ7eAPNY1sZZwacg13D8xx10V8dePgRuscUWUR+U4N eM2xx19Lvnk32EK3XPopoKN/bFoXaypbf7lSMohqkhQ4624Z18qJwKchdyg12GcSMWAdsr pnuLx0r9/cK4oT/M29xT05fPvA7NuAlllT8b6H3TN5m7+BGq5db3O6E9qNNOELDYml1MMB r7iKCYiQ7wrdoJ0SfMX94zKpGQ9e4x38DC0j1I1FwfFmPW5kzISmK8my4wQNJw2DthGFnM zvM0sAtocTxvg5+QCAIEQvolrAO7gtpILLgMl8cjI3FZfc6g5QbbvYeBaI5+9A== From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] =?utf-8?b?QlVHMTIzMDE6IElwdGFibGVzIOKAnGhvc3QvbmV0d29yayA=?= =?utf-8?b?4oCYbm9uZeKAmSBub3QgZm91bmTigJ0=?= Date: Thu, 1 Apr 2021 14:50:44 +0200 Message-Id: <20210401125044.39919-1-alexander.marx@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes: #12301 When using hosts with MAC-addresses in a hostgroup, the rule won't be generated if those hosts are selected as target. There is a hint but due to a wrong hashparameter the hint was not shown. With this patch the hint is shown again. --- html/cgi-bin/firewall.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 1483e779f..b0851dd3e 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -592,7 +592,7 @@ sub checktarget &General::readhasharray("$confighost", \%customhost); foreach my $grpkey (sort keys %customgrp){ foreach my $hostkey (sort keys %customhost){ - if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){ + if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[0] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){ $hint=$Lang::tr{'fwdfw hint mac'}; return $hint; }