diff options
| author | Alexander Wilke <nachtfalkeaw@web.de> | 2012-10-01 12:01:11 -0700 |
|---|---|---|
| committer | Alexander Wilke <nachtfalkeaw@web.de> | 2012-10-01 12:01:11 -0700 |
| commit | 438c72341f82830b21cf4c59dad2aa480a2ca6b6 (patch) | |
| tree | 80eecc36cdb934229f3b397164f0535924944212 | |
| parent | 360b9fa1e48221f6b07c3dde8f2b0f757a70f710 (diff) | |
| parent | 216f21eec749dfa66b4fd7241e0fa8742fcaaa9d (diff) | |
| download | pfsense-packages-438c72341f82830b21cf4c59dad2aa480a2ca6b6.tar.gz pfsense-packages-438c72341f82830b21cf4c59dad2aa480a2ca6b6.tar.bz2 pfsense-packages-438c72341f82830b21cf4c59dad2aa480a2ca6b6.zip | |
Merge pull request #324 from Nachtfalkeaw/master
FreeRADIUS2: New XMLRPC sync options
| -rw-r--r-- | config/freeradius2/freeradius.inc | 23 | ||||
| -rw-r--r-- | config/freeradius2/freeradiussync.xml | 3 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 92ec2e4f..79aaa5bd 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -2465,25 +2465,24 @@ function freeradius_sync_on_changes() { return; } - log_error("FreeRADIUS: Starting XMLRPC process (freeradius_do_xmlrpc_sync)."); - log_error("FreeRADIUS: Starting XMLRPC with time out: {$varsynctimeout}."); + log_error("FreeRADIUS: Starting XMLRPC process (freeradius_do_xmlrpc_sync) with timeout {$varsynctimeout} seconds."); // if checkbox is checked get IP and password of the destination hosts foreach ($config['installedpackages']['freeradiussync']['config'] as $rs ){ foreach($rs['row'] as $sh){ // if checkbox is NOT checked do nothing if($sh['varsyncdestinenable']) { - $varsyncprotocol = $sh['varsyncprotocol']; - $sync_to_ip = $sh['varsyncipaddress']; - $password = $sh['varsyncpassword']; - $varsyncport = $sh['varsyncport']; - if($password && $sync_to_ip && $varsyncport && $varsyncprotocol) + $varsyncprotocol = $sh['varsyncprotocol']; + $sync_to_ip = $sh['varsyncipaddress']; + $password = $sh['varsyncpassword']; + $varsyncport = $sh['varsyncport']; + if($password && $sync_to_ip && $varsyncport && $varsyncprotocol) freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyncprotocol); - } - else { - log_error("FreeRADIUS: Sync with {$sh['varsyncipaddress']} is disable"); - } - } + } + else { + log_error("FreeRADIUS: XMLRPC Sync with {$sh['varsyncipaddress']} is disabled"); + } + } } log_error("FreeRADIUS: Finished XMLRPC process (freeradius_do_xmlrpc_sync)."); } diff --git a/config/freeradius2/freeradiussync.xml b/config/freeradius2/freeradiussync.xml index 6d7d6f2f..5f1acc74 100644 --- a/config/freeradius2/freeradiussync.xml +++ b/config/freeradius2/freeradiussync.xml @@ -125,7 +125,7 @@ POSSIBILITY OF SUCH DAMAGE. <field> <fielddescr>XMLRPC timeout</fielddescr> <fieldname>varsynctimeout</fieldname> - <description><![CDATA[Timeout in seconds for the XMLRPC timeout]]></description> + <description><![CDATA[Timeout in seconds for the XMLRPC timeout. Default: 150]]></description> <type>input</type> <default_value>150</default_value> <size>5</size> @@ -137,6 +137,7 @@ POSSIBILITY OF SUCH DAMAGE. <type>rowhelper</type> <rowhelper> <rowhelperfield> + <fielddescr>Enable</fielddescr> <fieldname>varsyncdestinenable</fieldname> <type>checkbox</type> </rowhelperfield> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 3daa21a3..0ba9e673 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1091,7 +1091,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_1 pkg v1.6.6_3</version> + <version>2.1.12_1 pkg v1.6.6_4</version> <status>RC1</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 4efa7ea0..aac318e6 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1078,7 +1078,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_1 pkg v1.6.6_3</version> + <version>2.1.12_1 pkg v1.6.6_4</version> <status>RC1</status> <required_version>2.0</required_version> <maintainer>nachtfalkeaw@web.de</maintainer> |