From patchwork Mon Jun 21 12:44:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 4450 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 4G7q4Q6KN8z3wbS for ; Mon, 21 Jun 2021 12:45:10 +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 4G7q4N4WRVzp; Mon, 21 Jun 2021 12:45:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G7q4N1Qd9z2xxv; Mon, 21 Jun 2021 12:45:08 +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 4G7q4L657pz2xKp for ; Mon, 21 Jun 2021 12:45:06 +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 4G7q4K5CwTzp; Mon, 21 Jun 2021 12:45:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624279506; 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=ityONMix2j+e2kFIJKend90LzayMT48mXfPW/bjpcRw=; b=0ttYoBA2JLPUYyNUrIuB3ZGgjEiaQKI4q8U1MBOzZoZ3y++0SNCr7HXssd/IqoaZXpLiBY 3jePICPWeHNkqWCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624279506; 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=ityONMix2j+e2kFIJKend90LzayMT48mXfPW/bjpcRw=; b=lH30HLgWNaFo6dkEthGMI4hK5LolTwiA1Drwu5fyd2CKj7GKAFpKvcJ5E7nl1T/lyn7/G6 B6z7f6dBpK8f/pm8nsd241VV5S8cnsLJNieLYo1Rp8phi2Mc4lFmDZ7V+CyaSLNKIGUPK1 sF+DL9Rr/ziRIae2b3SM0iYVtwyY6nz7fbTxqTjvd6XoMe00Axk9pNiwBlxeoKN4R8xD6b 85XEQf6/5avlh6mfk2AB2kHpiLcwIXdc0/hITG8c/mNrA3QvuhFMMmNgMfX6VV5qBKEViA K2676+FD+FA4nkym3wsuQQ2fu1lZIkr3GoMCdMNPSfihNLiLRcypsYnf79BV7Q== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/3] pppsetup.cgi: Fix typos. Date: Mon, 21 Jun 2021 14:44:57 +0200 Message-Id: <20210621124459.3620-1-stefan.schantl@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" Signed-off-by: Stefan Schantl --- html/cgi-bin/pppsetup.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 519a062bc..beb7fabc7 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -180,8 +180,8 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) goto ERROR; } # Read-in ddns config file, to check if at least one provider is enabled. - open(FILE, "${General::swroot}/ddns/config)"; - my @ddns_config = + open(FILE, "${General::swroot}/ddns/config"); + my @ddns_config = ; close(FILE); if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && grep(/on/, @ddns_config) ) { @@ -529,7 +529,7 @@ END # Read-in atm devices from proc. open(PROC, "/proc/net/atm/devices"); -my @patm_devices = ; +my @atm_devices = ; close(PROC); my $atmdev = grep(/0/, @atm_devices); From patchwork Mon Jun 21 12:44:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 4451 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 4G7q4S345xz3wbS for ; Mon, 21 Jun 2021 12:45:12 +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 4G7q4N6hnnz1JF; Mon, 21 Jun 2021 12:45:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G7q4N2KhZz2y4j; Mon, 21 Jun 2021 12:45:08 +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 4G7q4M1gmjz2xKp for ; Mon, 21 Jun 2021 12:45:07 +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 4G7q4L60kXz161; Mon, 21 Jun 2021 12:45:06 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624279507; 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: in-reply-to:in-reply-to:references:references; bh=CTVoIT29UUPOCpp6y/+UNaXBtngN0Kj4rPpMAUzrJvQ=; b=RgSQSULB1fePkzGJTDszq8Ux5uoVAFHOp7yRkKDarxlAxQmQS6DgjFBffTXtEd6WqzcuRi 0xfoRlDmZeCmSKAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624279507; 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: in-reply-to:in-reply-to:references:references; bh=CTVoIT29UUPOCpp6y/+UNaXBtngN0Kj4rPpMAUzrJvQ=; b=sEEn6SLQQCYi/Ea++z48yNZbdbhIdkZ8Wk42NAJ/L5Y0efdZUL6grqzb9oOQC0/Sd2Xwqz 3H8+DIxO7t/beRj4hz8NjWt/aaQhl/52+oxyvjxT84WqXCn/YUIEhh6q8+smmKV0HGIemd tmdHdHnc0VGFM9XbR2cx+TxhlMcBoqjpk8E+b4IsHrCLFQTI9TGKKJtzuq6nWaC1vRznls vmZPVUYUdbHqNWQ6wQSQid2Andl84pm2lRfEXYE8IpMQXI1bAfSlNMkUnl1JNJXdn1wkvC hvaqxnJEupAEqJ2utDVJoz6em7id/tTQoOhY63SfLWvhzJdzG2ZE3ggG3r7qEQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/3] vpnmain.cgi: Fix typo. Date: Mon, 21 Jun 2021 14:44:58 +0200 Message-Id: <20210621124459.3620-2-stefan.schantl@ipfire.org> In-Reply-To: <20210621124459.3620-1-stefan.schantl@ipfire.org> References: <20210621124459.3620-1-stefan.schantl@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" Signed-off-by: Stefan Schantl --- html/cgi-bin/vpnmain.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 79a2943d4..8f13cf51f 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1260,7 +1260,7 @@ END open(FILE, "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); my @p12 = ; close(FILE); - print "@file"; + print "@p12"; exit (0); From patchwork Mon Jun 21 12:44:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 4452 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 4G7q4V21GYz3wbS for ; Mon, 21 Jun 2021 12:45:14 +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 4G7q4P1KPHz1MG; Mon, 21 Jun 2021 12:45:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G7q4N341hz2y2L; Mon, 21 Jun 2021 12:45:08 +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 4G7q4M4g3kz2xKp for ; Mon, 21 Jun 2021 12:45:07 +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 4G7q4M1nYvz176; Mon, 21 Jun 2021 12:45:07 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624279507; 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: in-reply-to:in-reply-to:references:references; bh=R9MW+Vq64q2DxQGbzEjlEnZCCg8rXegdUFh+dZ0oOKk=; b=xWLtD5NQVg7zyoTvLenN6/pDm2eP5qLa7s9VPmXQ6+PdOEmRwnQosD8ebU8Y/9PuIfGFbn mlYAs5+sKxqWyYAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624279507; 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: in-reply-to:in-reply-to:references:references; bh=R9MW+Vq64q2DxQGbzEjlEnZCCg8rXegdUFh+dZ0oOKk=; b=Rr5OvXrRLipIjkIGXDDPdXE1KJoEce2FWK3IbnwFGziBxQSd+s9VUOa89igzKXUl0p6/My DpaqQ6GD00ZFd9PX3AGEdACVXEig4OuxGanobOdbUjm9X4R1U/cLOWjAxFNFU5a3z9QGXZ rJsTIaGbB1xy79J7g/l07THFEYGDLK0mCLssWWvTsK7d84oWpLUYYJkrei0v44WLojepSA DYL/ubhT3fgbPTIqscA/sSwPOlkAzoUgIQMoJJZiSPb0GWrgJZLy889YSGOhrsFuaJhamB GQrXbJNgXR3TRIXmwVMDVWbCWf183OfhJU5b5BwBf/1mr5yz6s5H1QNU6GEwTg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 3/3] ovpnmain.cgi: Fix typos. Date: Mon, 21 Jun 2021 14:44:59 +0200 Message-Id: <20210621124459.3620-3-stefan.schantl@ipfire.org> In-Reply-To: <20210621124459.3620-1-stefan.schantl@ipfire.org> References: <20210621124459.3620-1-stefan.schantl@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" Signed-off-by: Stefan Schantl --- html/cgi-bin/ovpnmain.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 077f5ab6c..023000dd5 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1226,7 +1226,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) { &General::system("touch", "${General::swroot}/ovpn/enable_blue"); } else { - unlink(${General::swroot}/ovpn/enable_blue); + unlink("${General::swroot}/ovpn/enable_blue"); } if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' ) { @@ -1488,7 +1488,7 @@ END } } - @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem"); + my @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem"); my $casubject; foreach my $line (@casubject) { @@ -2517,7 +2517,7 @@ else if ($confighash{$cgiparams{'KEY'}}) { # Revoke certificate if certificate was deleted and rewrite the CRL - &General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf)"; + &General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf"); &General::system("/usr/bin/openssl", "ca", "-gencrl", "-out", "${General::swroot}/ovpn/crls/cacrl.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf"); ###