From patchwork Sat Oct  7 01:07:54 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Erik Kapfer <erik.kapfer@ipfire.org>
X-Patchwork-Id: 1442
Return-Path: <development-bounces@lists.ipfire.org>
Received: from mail01.ipfire.org (unknown [172.28.1.200])
	by web02.ipfire.org (Postfix) with ESMTP id F1F1C60AD7
	for <patchwork@ipfire.org>; Fri,  6 Oct 2017 16:08:09 +0200 (CEST)
Received: from mail01.ipfire.org (localhost [IPv6:::1])
	by mail01.ipfire.org (Postfix) with ESMTP id 263EC284E;
	Fri,  6 Oct 2017 16:08:09 +0200 (CEST)
Received: from localhost.localdomain (p5DC0BBEC.dip0.t-ipconnect.de
	[93.192.187.236])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits))
	(No client certificate requested)
	by mail01.ipfire.org (Postfix) with ESMTPSA id 56CA0282F;
	Fri,  6 Oct 2017 16:08:06 +0200 (CEST)
From: Erik Kapfer <erik.kapfer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] chpasswd: Use well known 'General::swroot' instead of
	'swroot' .
Date: Fri,  6 Oct 2017 16:07:54 +0200
Message-Id: <1507298874-8668-1-git-send-email-erik.kapfer@ipfire.org>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1507122180-16347-1-git-send-email-erik.kapfer@ipfire.org>
References: <1507122180-16347-1-git-send-email-erik.kapfer@ipfire.org>
X-BeenThere: development@lists.ipfire.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: IPFire development talk <development.lists.ipfire.org>
List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>,
	<mailto:development-request@lists.ipfire.org?subject=unsubscribe>
List-Archive: <http://lists.ipfire.org/pipermail/development/>
List-Post: <mailto:development@lists.ipfire.org>
List-Help: <mailto:development-request@lists.ipfire.org?subject=help>
List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>,
	<mailto:development-request@lists.ipfire.org?subject=subscribe>
Errors-To: development-bounces@lists.ipfire.org
Sender: "Development" <development-bounces@lists.ipfire.org>

---
 html/cgi-bin/chpasswd.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index a00f9cb..6aa57d0 100644
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -34,15 +34,14 @@ my %mainsettings;
 my %proxysettings;
 my %netsettings;
 my %temp;
-my $swroot;
 my $errormessage;
 my $language;
 
 $proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
 
 ### Initialize environment
-&readhash("${swroot}/main/settings", \%mainsettings);
-&readhash("${swroot}/proxy/advanced/settings", \%proxysettings);
+&readhash("${General::swroot}/main/settings", \%mainsettings);
+&readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
 $language = $mainsettings{'LANGUAGE'};
 
 ### Initialize language
@@ -52,9 +51,9 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
-my $userdb = "$swroot/proxy/advanced/ncsa/passwd";
+my $userdb = "${General::swroot}/proxy/advanced/ncsa/passwd";
 
-&readhash("$swroot/ethernet/settings", \%netsettings);
+&readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
 my $success = 0;
 
@@ -295,3 +294,4 @@ sub getcgihash
 
 # -------------------------------------------------------------------
 
+