aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/freeradius2/freeradius.inc16
-rw-r--r--config/freeradius2/freeradius.xml2
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 13 insertions, 11 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index a094853a..76da6213 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -54,12 +54,12 @@ else
define('FREERADIUS_BASE', '/usr/local');
$bash_path = FREERADIUS_BASE . "/bin/bash";
-if ($pfs_version == "2.1") {
- define('FREERADIUS_LIB', FREERADIUS_BASE . '/lib');
- define('FREERADIUS_ETC', FREERADIUS_BASE . '/etc');
-} else {
+if ($pfs_version == "2.2") {
define('FREERADIUS_LIB', FREERADIUS_BASE . '/local/lib');
define('FREERADIUS_ETC', FREERADIUS_BASE . '/local/etc');
+} else {
+ define('FREERADIUS_LIB', FREERADIUS_BASE . '/lib');
+ define('FREERADIUS_ETC', FREERADIUS_BASE . '/etc');
}
// Check freeradius lib version
@@ -68,11 +68,11 @@ if ($pfs_version == "2.1") {
$libfiles = scandir(FREERADIUS_LIB);
foreach ($libfiles as $libfile){
if (preg_match("/freeradius-/",$libfile))
- $frlib=FREERADIUS_BASE . "/lib/{$libfile}";
+ $frlib=FREERADIUS_LIB . '/' . $libfile;
}
}
if ($frlib == ""){
- log_error("freeRADIUS - No freeradius lib found on ".FREERADIUS_BASE."/lib");
+ log_error("freeRADIUS - No freeradius lib found on ".FREERADIUS_LIB);
}
function freeradius_deinstall_command() {
@@ -95,7 +95,9 @@ function freeradius_install_command() {
@symlink(FREERADIUS_ETC . "/raddb", "/usr/local/etc/raddb");
if (!file_exists("/var/log/radutmp")) { exec("touch /var/log/radutmp"); }
if (!file_exists("/var/log/radwtmp")) { exec("touch /var/log/radwtmp"); }
- exec("chown -R root:wheel " . FREERADIUS_ETC . "/raddb && chown -R root:wheel {$frlib} && chown -R root:wheel /var/log/radacct");
+ exec("chown -R root:wheel " . FREERADIUS_ETC . "/raddb /var/log/radacct");
+ if (file_exists($frlib))
+ exec("chown -R root:wheel {$frlib}");
// creating a backup file of the original policy.conf no matter if user checked this or not
if (!file_exists(FREERADIUS_ETC . "/raddb/policy.conf.backup")) {
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml
index 8cef9430..16a4875c 100644
--- a/config/freeradius2/freeradius.xml
+++ b/config/freeradius2/freeradius.xml
@@ -45,7 +45,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradius</name>
- <version>2.2.0</version>
+ <version>1.6.12</version>
<title>FreeRADIUS: Users</title>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
<menu>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index bcd5eac2..7a866352 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -865,7 +865,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>1.6.11</version>
+ <version>1.6.12</version>
<status>RC1</status>
<required_version>2.2</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index cc81d9f4..2b80b127 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1041,7 +1041,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>2.2.5_3 pkg v1.6.11</version>
+ <version>1.6.12</version>
<status>RC1</status>
<required_version>2.1</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index e221bc4d..8e821af7 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1028,7 +1028,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>2.2.5_3 pkg v1.6.11</version>
+ <version>1.6.12</version>
<status>RC1</status>
<required_version>2.1</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>