diff options
| author | marcelloc <marcellocoutinho@gmail.com> | 2012-09-24 16:45:08 -0300 |
|---|---|---|
| committer | marcelloc <marcellocoutinho@gmail.com> | 2012-09-24 16:45:08 -0300 |
| commit | 7623e022c458816bc28608b0c4344bd319e4629f (patch) | |
| tree | 5ddd6b725e68b527ff8a086c5efe31b5d9370dad | |
| parent | cb095ccc599838a8afeaba6d511362fd20006962 (diff) | |
| download | pfsense-packages-7623e022c458816bc28608b0c4344bd319e4629f.tar.gz pfsense-packages-7623e022c458816bc28608b0c4344bd319e4629f.tar.bz2 pfsense-packages-7623e022c458816bc28608b0c4344bd319e4629f.zip | |
dansguardian - add additional check to detect xml rpc sync call
| -rwxr-xr-x | config/dansguardian/dansguardian.inc | 6 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index 4bb30cce..c897f944 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -90,7 +90,7 @@ function check_ca_hashes(){ } } -function sync_package_dansguardian() { +function sync_package_dansguardian($via_rpc=false) { global $config,$g; # detect boot process @@ -101,7 +101,7 @@ function sync_package_dansguardian() { $boot_process="on"; } - if (is_process_running('dansguardian') && isset($boot_process)) + if (is_process_running('dansguardian') && isset($boot_process) && $via_rpc==false) return; #assign xml arrays @@ -1316,7 +1316,7 @@ function dansguardian_do_xmlrpc_sync($sync_to_ip, $password,$sync_type) { /* tell dansguardian to reload our settings on the destionation sync host. */ $method = 'pfsense.exec_php'; $execcmd = "require_once('/usr/local/pkg/dansguardian.inc');\n"; - $execcmd .= "sync_package_dansguardian();"; + $execcmd .= "sync_package_dansguardian(true);"; /* assemble xmlrpc payload */ $params = array( diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 50e1990b..f7723d59 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -598,7 +598,7 @@ <depends_on_package>clamav-0.97.3_1.tbz</depends_on_package> <depends_on_package>ca_root_nss-3.13.3.tbz</depends_on_package> <depends_on_package_pbi>dansguardian-2.12.0.0_1-i386.pbi</depends_on_package_pbi> - <version>2.12.0.0 pkg v.0.1.6</version> + <version>2.12.0.0 pkg v.0.1.6_1</version> <status>beta</status> <required_version>2.0</required_version> <configurationfile>dansguardian.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 49f63d82..80ba838b 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -585,7 +585,7 @@ <depends_on_package>clamav-0.97.3_1.tbz</depends_on_package> <depends_on_package>ca_root_nss-3.13.3.tbz</depends_on_package> <depends_on_package_pbi>dansguardian-2.12.0.0_1-amd64.pbi</depends_on_package_pbi> - <version>2.12.0.0 pkg v.0.1.6</version> + <version>2.12.0.0 pkg v.0.1.6_1</version> <status>beta</status> <required_version>2.0</required_version> <configurationfile>dansguardian.xml</configurationfile> |