From mboxrd@z Thu Jan 1 00:00:00 1970
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, 06 Oct 2017 16:07:54 +0200
Message-ID: <1507298874-8668-1-git-send-email-erik.kapfer@ipfire.org>
In-Reply-To: <1507122180-16347-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3287192946559679687=="
List-Id: <development.lists.ipfire.org>
--===============3287192946559679687==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
---
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
# -------------------------------------------------------------------
+
--
2.7.4
--===============3287192946559679687==--