aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-05-09 14:49:16 -0400
committerjim-p <jimp@pfsense.org>2014-05-09 14:49:16 -0400
commit0909bcf44cc4535c9dbb19f226fdb01c442175ff (patch)
treea3969d42ddbaddc795b8f831411dbc6b537d491f
parent173c5007b5f863fb642bc86bf906c9eb80ac32e7 (diff)
downloadpfsense-packages-0909bcf44cc4535c9dbb19f226fdb01c442175ff.tar.gz
pfsense-packages-0909bcf44cc4535c9dbb19f226fdb01c442175ff.tar.bz2
pfsense-packages-0909bcf44cc4535c9dbb19f226fdb01c442175ff.zip
Fix call-time pass-by-reference in syslog-ng, bump
-rw-r--r--config/syslog-ng/syslog-ng.inc4
-rw-r--r--config/syslog-ng/syslog-ng.xml4
-rw-r--r--config/syslog-ng/syslog-ng_advanced.xml2
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
6 files changed, 8 insertions, 8 deletions
diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index f821e75d..395a97d6 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -61,7 +61,7 @@ function syslogng_deinstall_command() {
filter_configure();
}
-function syslogng_validate_general($post, $input_errors) {
+function syslogng_validate_general($post, &$input_errors) {
global $config;
$objects = $config['installedpackages']['syslogngadvanced']['config'];
@@ -100,7 +100,7 @@ function syslogng_validate_general($post, $input_errors) {
$input_errors[] = "Syslog-ng syntax test failed:\n" . $errors;
}
-function syslogng_validate_advanced($post, $input_errors) {
+function syslogng_validate_advanced($post, &$input_errors) {
global $config;
$objects = $config['installedpackages']['syslogngadvanced']['config'];
diff --git a/config/syslog-ng/syslog-ng.xml b/config/syslog-ng/syslog-ng.xml
index 37df86ec..7d58a2ef 100644
--- a/config/syslog-ng/syslog-ng.xml
+++ b/config/syslog-ng/syslog-ng.xml
@@ -42,7 +42,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>Syslog-ng</name>
- <version>3.3.4_1</version>
+ <version>3.5.4.1_1 pkg.v.1.0.1</version>
<title>Services: Syslog-ng</title>
<include_file>/usr/local/pkg/syslog-ng.inc</include_file>
<menu>
@@ -177,7 +177,7 @@
</field>
</fields>
<custom_php_validation_command>
- syslogng_validate_general($_POST, &amp;$input_errors);
+ syslogng_validate_general($_POST, $input_errors);
</custom_php_validation_command>
<custom_php_resync_config_command>
syslogng_resync();
diff --git a/config/syslog-ng/syslog-ng_advanced.xml b/config/syslog-ng/syslog-ng_advanced.xml
index 2ddcf1e0..b1290544 100644
--- a/config/syslog-ng/syslog-ng_advanced.xml
+++ b/config/syslog-ng/syslog-ng_advanced.xml
@@ -128,7 +128,7 @@
syslogng_resync();
</custom_delete_php_command>
<custom_php_validation_command>
- syslogng_validate_advanced($_POST, &amp;$input_errors);
+ syslogng_validate_advanced($_POST, $input_errors);
</custom_php_validation_command>
<custom_php_resync_config_command>
syslogng_resync();
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index f22579bc..68a584ef 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1421,7 +1421,7 @@
<website>http://www.balabit.com/network-security/syslog-ng/</website>
<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
<category>Services</category>
- <version>3.5.4.1</version>
+ <version>3.5.4.1_1 pkg.v.1.0.1</version>
<status>ALPHA</status>
<required_version>2.2</required_version>
<depends_on_package_pbi>syslog-ng-3.5.4.1-##ARCH##.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index db5b1673..6a0a90bd 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1856,7 +1856,7 @@
<website>http://www.balabit.com/network-security/syslog-ng/</website>
<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
<category>Services</category>
- <version>3.5.4.1_1</version>
+ <version>3.5.4.1_1 pkg.v.1.0.1</version>
<status>ALPHA</status>
<required_version>2.1</required_version>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index c28de874..06cacc4a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1843,7 +1843,7 @@
<website>http://www.balabit.com/network-security/syslog-ng/</website>
<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
<category>Services</category>
- <version>3.5.4.1_1</version>
+ <version>3.5.4.1_1 pkg.v.1.0.1</version>
<status>ALPHA</status>
<required_version>2.1</required_version>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>