aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-05-07 16:04:40 -0400
committerjim-p <jimp@pfsense.org>2014-05-07 16:04:59 -0400
commit3df182b3caadfbddf3a9d4426c79164834b85fd4 (patch)
treecbdd71253a3baabd6ca4860ec162acbcb01347d3
parentf7c97753f5d61f2e6318163da1bd289ca1d50489 (diff)
downloadpfsense-packages-3df182b3caadfbddf3a9d4426c79164834b85fd4.tar.gz
pfsense-packages-3df182b3caadfbddf3a9d4426c79164834b85fd4.tar.bz2
pfsense-packages-3df182b3caadfbddf3a9d4426c79164834b85fd4.zip
Fix call-time pass-by-reference in nut, bump
-rw-r--r--config/nut/nut.inc4
-rw-r--r--config/nut/nut.xml6
-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, 8 insertions, 8 deletions
diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index 793e24fd..11fb4b26 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -97,7 +97,7 @@
return true;
}
- function before_form_nut($pkg) {
+ function before_form_nut(&$pkg) {
/* return available serial ports */
$serial_types = array("sio", "cua", "tty");
@@ -136,7 +136,7 @@
$field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]);
}
- function validate_form_nut($post, $input_errors) {
+ function validate_form_nut($post, &$input_errors) {
global $config;
/* monitor remote validation */
diff --git a/config/nut/nut.xml b/config/nut/nut.xml
index b78c9dba..210d7b82 100644
--- a/config/nut/nut.xml
+++ b/config/nut/nut.xml
@@ -46,7 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>nut</name>
- <version>2.6.4 pkg 2.0</version>
+ <version>2.6.5_1 pkg 2.0.1</version>
<title>Services: NUT</title>
<savetext>Change</savetext>
<aftersaveredirect>/status_nut.php</aftersaveredirect>
@@ -646,10 +646,10 @@
</field>
</fields>
<custom_php_command_before_form>
- before_form_nut(&amp;$pkg);
+ before_form_nut($pkg);
</custom_php_command_before_form>
<custom_php_validation_command>
- validate_form_nut($_POST, &amp;$input_errors);
+ validate_form_nut($_POST, $input_errors);
</custom_php_validation_command>
<custom_php_resync_config_command>
sync_package_nut();
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index eba6abc0..2f3e4199 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -732,7 +732,7 @@
<descr>Network UPS Tools</descr>
<website>http://www.networkupstools.org/</website>
<category>Network Management</category>
- <version>2.6.5_1 pkg 2.0</version>
+ <version>2.6.5_1 pkg 2.0.1</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>rswagoner@gmail.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 181f61ea..f7e57d74 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -985,7 +985,7 @@
<descr>Network UPS Tools</descr>
<website>http://www.networkupstools.org/</website>
<category>Network Management</category>
- <version>2.6.5_1 pkg 2.0_1</version>
+ <version>2.6.5_1 pkg 2.0.1</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>rswagoner@gmail.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index db58d8f9..1f1222ce 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -972,7 +972,7 @@
<descr>Network UPS Tools</descr>
<website>http://www.networkupstools.org/</website>
<category>Network Management</category>
- <version>2.6.5_1 pkg 2.0_1</version>
+ <version>2.6.5_1 pkg 2.0.1</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>rswagoner@gmail.com</maintainer>