aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2012-01-11 12:06:45 -0800
committerJim P <jim@pingle.org>2012-01-11 12:06:45 -0800
commitd533cf7e8ff100e98590c30d1600c441ce2c78c9 (patch)
tree4d1ecf5f496d92f72f3075eb1016672c557204b0
parentfd2a759662f1f537c7fe7643e50ff7153b5f26e6 (diff)
parent234eb8ac476a857d7adf924a479a9421b2c73b16 (diff)
downloadpfsense-packages-d533cf7e8ff100e98590c30d1600c441ce2c78c9.tar.gz
pfsense-packages-d533cf7e8ff100e98590c30d1600c441ce2c78c9.tar.bz2
pfsense-packages-d533cf7e8ff100e98590c30d1600c441ce2c78c9.zip
Merge pull request #195 from Nachtfalkeaw/master
freeradius2 updates pkg v1.5.0
-rw-r--r--config/freeradius2/freeradius.inc19
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
3 files changed, 14 insertions, 9 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index 3be0faa0..3506641f 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -50,12 +50,7 @@ define('RADDB', '/usr/local/etc/raddb');
function freeradius_deinstall_command() {
exec("cd /var/db/pkg && pkg_delete `ls | grep freeradius`");
exec("rm -rf /usr/local/etc/raddb/");
- exec("rm -rf /var/log/raddb/");
- exec("rm -rf /var/log/radacct/");
exec("rm -rf /var/run/radiusd/");
- exec("rm -f /var/log/radius.log");
- exec("rm -f /var/log/radutmp");
- exec("rm -f /var/log/radwtmp");
}
function freeradius_install_command() {
@@ -74,6 +69,9 @@ function freeradius_install_command() {
exec("chown -R root:wheel /usr/local/etc/raddb");
exec("chown -R root:wheel /usr/local/lib/freeradius-2.1.12");
+ exec("touch /var/log/radutmp && touch /var/log/radwtmp");
+ exec("chown -R root:wheel /var/log");
+
// creating a backup file of the original policy.conf no matter if user checked this or not
if (!file_exists("/usr/local/etc/raddb/policy.conf.backup")) {
@@ -343,6 +341,7 @@ instantiate {
weekly
monthly
forever
+
expiration
logintime
### Dis-/Enable sql instatiate
@@ -359,11 +358,14 @@ EOD;
conf_mount_ro();
// "freeradius_sqlconf_resync" is pointing to this function because we need to run "freeradius_serverdefault_resync" and after that restart freeradius.
- freeradius_plainmacauth_resync();
freeradius_serverdefault_resync();
freeradius_modulescounter_resync();
freeradius_modulesmschap_resync();
freeradius_modulesrealm_resync();
+ // This is to fix the mysqlclient.so which gets lost after reboot
+ exec("ldconfig -m /usr/local/lib/mysql");
+ // Change owner of freeradius created files
+ exec("chown -R root:wheel /var/log");
restart_service("radiusd");
}
@@ -1300,6 +1302,7 @@ authorize {
weekly
monthly
forever
+
#
# Use the checkval module
@@ -1494,6 +1497,7 @@ accounting {
weekly
monthly
forever
+
# Update the wtmp file
#
@@ -2178,6 +2182,7 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password) {
/* xml will hold the sections to sync */
$xml = array();
$xml['freeradius'] = $config['installedpackages']['freeradius'];
+ $xml['freeradiusauthorizedmacs'] = $config['installedpackages']['freeradiusauthorizedmacs'];
$xml['freeradiusclients'] = $config['installedpackages']['freeradiusclients'];
/* assemble xmlrpc payload */
@@ -2251,7 +2256,7 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password) {
function freeradius_all_after_XMLRPC_resync() {
freeradius_users_resync();
- freeradius_sync_on_changes();
+ freeradius_authorizedmacs_resync();
freeradius_clients_resync();
log_error("freeRADIUS has finished XMLRPC process. It should be OK. For more information look at the host which started sync.");
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 244ac80b..1bac6c0a 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -807,7 +807,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>http://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>2.1.12 pkg v1.4.9</version>
+ <version>2.1.12 pkg v1.5.0</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 01aa957b..a622ee25 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -854,7 +854,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>http://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>2.1.12 pkg v1.4.9</version>
+ <version>2.1.12 pkg v1.5.0</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>