aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2011-12-20 09:04:34 -0800
committerJim P <jim@pingle.org>2011-12-20 09:04:34 -0800
commit6d1ae1ce858330b9debd8c6ff1afbc44cd20327d (patch)
treefc4c7c925a166a1c7b3df616a74a7c9a60cfd0aa
parentd6eb6006d72055b43ba78fd6401306fd64615083 (diff)
parent8efca62e7cfa0698d349e071d022f811c065797c (diff)
downloadpfsense-packages-6d1ae1ce858330b9debd8c6ff1afbc44cd20327d.tar.gz
pfsense-packages-6d1ae1ce858330b9debd8c6ff1afbc44cd20327d.tar.bz2
pfsense-packages-6d1ae1ce858330b9debd8c6ff1afbc44cd20327d.zip
Merge pull request #151 from Nachtfalkeaw/master
deleted useless line + version bump from previous fixes
-rw-r--r--config/freeradius2/freeradius.inc3
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
3 files changed, 2 insertions, 5 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index a3558cea..879077f4 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -257,9 +257,6 @@ global $config;
$conf = '';
$users = $config['installedpackages']['freeradius']['config'];
-
-$usersoutput = $config['installedpackages']['freeradius']['config'][0]['usersoutput']=base64_encode(file_get_contents('/usr/local/etc/raddb/users'));
-
if (is_array($users)) {
foreach ($users as $user) {
$username = $user['username'];
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index cddd9d51..c6bbe8fd 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -764,7 +764,7 @@
Do not use together with freeradius package. Both are using the same XML files.]]></descr>
<pkginfolink>http://forum.pfsense.org/index.php/topic,43675.0.html</pkginfolink>
<category>System</category>
- <version>2.1.12 pkg v1.3.0</version>
+ <version>2.1.12 pkg v1.3.1</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>Nachtfalke</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 43c94294..f9a7dd8b 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -806,7 +806,7 @@
Do not use together with freeradius package. Both are using the same XML files.]]></descr>
<pkginfolink>http://forum.pfsense.org/index.php/topic,43675.0.html</pkginfolink>
<category>System</category>
- <version>2.1.12 pkg v1.3.0</version>
+ <version>2.1.12 pkg v1.3.1</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>Nachtfalke</maintainer>