From patchwork Thu Oct 14 13:26:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4787 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HVVYD2sgxz3wcZ for ; Thu, 14 Oct 2021 13:26:40 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HVVYB5Y6Gz1yH; Thu, 14 Oct 2021 13:26:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HVVYB3vRSz2xWt; Thu, 14 Oct 2021 13:26:38 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HVVY91NWpz2xWt for ; Thu, 14 Oct 2021 13:26:37 +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 4HVVY84x10z97; Thu, 14 Oct 2021 13:26:36 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1634217996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=24ZPkptvMhi+g4lnv4cuFIOg0oTXbos6aHU6fATtNQY=; b=MOMiOoDJmr+744ULYaMK6zXtF7I/rcJWrwZLJwPOxqkzj0SSUalm5oF87OIu65Fj4e9m+2 fN1ZcvCDjvRzr1Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1634217996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=24ZPkptvMhi+g4lnv4cuFIOg0oTXbos6aHU6fATtNQY=; b=rTsVQ+jOxtybTKbszGRkBnzadZj45ZFk4e5exETHQheeRJdGwYjcseWdGPjEqG5vYnoW6r PTYOIOsxVztGdWFmMEVgAiAw/3tMB2WPdt2lURsCpp+D3UsmL0XQoPTWF8IOmvX/8PeSGv A6XyFZgoCCVZ9uDpik2+28a0Syve0NoA6Ew8XaaK6vnWgusIc0mwBsE4Y8tHuFTEWZP65y hWgOglJh5goJ+QKRYdjq40qq2dzTlr2lJMxYipJQ/P3TQ3ndnUbfGNW1GDitVHKw03c2vz fBQBhRS6hoyD3fdYKRXRz5Qx9Il5dATrq/aFZd7VNpkx+UKT+GC58alItwit5w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] index.cgi: Remove left-over DNSSEC status warning Date: Thu, 14 Oct 2021 13:26:30 +0000 Message-Id: <20211014132630.14073-1-michael.tremer@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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" An error message is still shown although there is no option to disable DNSSEC at the moment. The old marker file could still be present on older machines. Signed-off-by: Michael Tremer --- config/cfgroot/general-functions.pl | 11 ----------- html/cgi-bin/index.cgi | 5 ----- 2 files changed, 16 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index de608e38b..f72d6588c 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -1238,17 +1238,6 @@ sub get_red_interface() { return $interface; } -sub dnssec_status() { - my $path = "${General::swroot}/red/dnssec-status"; - - open(STATUS, $path) or return 0; - my $status = ; - close(STATUS); - - chomp($status); - - return $status; -} sub number_cpu_cores() { open my $cpuinfo, "/proc/cpuinfo" or die "Can't open cpuinfo: $!\n"; my $cores = scalar (map /^processor/, <$cpuinfo>); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index fafbe0aa1..948fdde55 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -536,11 +536,6 @@ END &Header::closebox(); } -my $dnssec_status = &General::dnssec_status(); -if ($dnssec_status eq "off") { - $warnmessage .= "
  • $Lang::tr{'dnssec disabled warning'}
    • "; -} - # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "
  • $Lang::tr{'fireinfo please enable'}
    • ";