Merge branch 'master' of https://github.com/pfsense/pfsense-packages

7 files changed, 12 insertions, 12 deletions

diff --git a/config/nmap/nmap.inc b/config/nmap/nmap.inc
index 18708159..272f27ef 100644
--- a/config/nmap/nmap.inc
+++ b/config/nmap/nmap.inc
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-function nmap_custom_php_validation_command($post, $input_errors) {
+function nmap_custom_php_validation_command($post, & $input_errors) {
 	global $_POST, $savemsg, $config;
 	if (empty($_POST['hostname'])) {
 		$input_errors[] = gettext("You must enter an IP address to scan.");
diff --git a/config/nmap/nmap.xml b/config/nmap/nmap.xml
index 4034222a..b07b3982 100644
--- a/config/nmap/nmap.xml
+++ b/config/nmap/nmap.xml
@@ -46,7 +46,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>nmap</name>
-	<version>6.01</version>
+	<version>6.40_2 pkg v1.2.1</version>
 	<title>Diagnostics: NMap</title>
 	<savetext>Scan</savetext>
 	<preoutput>yes</preoutput>
@@ -120,6 +120,6 @@
 		nmap_custom_add_php_command();
 	</custom_add_php_command>
 	<custom_php_validation_command>
-		nmap_custom_php_validation_command($_POST, &amp;$input_errors);
+		nmap_custom_php_validation_command($_POST, $input_errors);
 	</custom_php_validation_command>
 </packagegui>
diff --git a/config/sudo/sudo.inc b/config/sudo/sudo.inc
index 5ffa14c3..68cf4a00 100644
--- a/config/sudo/sudo.inc
+++ b/config/sudo/sudo.inc
@@ -165,7 +165,7 @@ function sudo_get_users($list_all_user = false) {
 /* Make sure commands passed in are valid executables to help ensure a valid sudoers file and expected behavior.
    This also forces the user to give full paths to executables, which they should be doing anyhow.
  */
-function sudo_validate_commands($input_errors) {
+function sudo_validate_commands(&$input_errors) {
 	$idx = 0;
 	while(isset($_POST["cmdlist{$idx}"])) {
 		$commands = $_POST["cmdlist" . $idx++];
diff --git a/config/sudo/sudo.xml b/config/sudo/sudo.xml
index 16fc272b..2fccab24 100644
--- a/config/sudo/sudo.xml
+++ b/config/sudo/sudo.xml
@@ -3,7 +3,7 @@
 	<description>Sudo Command Control</description>
 	<requirements>None</requirements>
 	<name>sudo</name>
-	<version>0.2</version>
+	<version>0.2.1</version>
 	<title>Sudo - Shell Command Privilege Delegation Utility</title>
 	<include_file>/usr/local/pkg/sudo.inc</include_file>
 	<menu>
@@ -83,7 +83,7 @@ User permission definitions for allowing the use of sudo by shell users to run c
 	</custom_php_resync_config_command>
 	<custom_php_validation_command>
 		<![CDATA[
-		sudo_validate_commands(&$input_errors);
+		sudo_validate_commands($input_errors);
 		]]>
 	</custom_php_validation_command>
 </packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index a624b6a6..b458e02e 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -700,7 +700,7 @@
 		<category>Security</category>
 		<depends_on_package_pbi>nmap-6.40_2-##ARCH##.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.40_2 pkg v1.2</version>
+		<version>nmap-6.40_2 pkg v1.2.1</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.2</required_version>
@@ -1490,7 +1490,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink>
 		<descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr>
 		<category>Security</category>
-		<version>0.2</version>
+		<version>0.2.1</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index dc09839e..b0aa5de8 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -954,7 +954,7 @@
 		<depends_on_package>nmap-6.25_1.tbz</depends_on_package>
 		<depends_on_package_pbi>nmap-6.40_2-i386.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.40_2 pkg v1.2</version>
+		<version>nmap-6.40_2 pkg v1.2.1</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -1933,7 +1933,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink>
 		<descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr>
 		<category>Security</category>
-		<version>0.2</version>
+		<version>0.2.1</version>
 		<status>Beta</status>
 		<required_version>2.0.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 987cbab2..a1d67317 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -941,7 +941,7 @@
 		<depends_on_package>nmap-6.25_1.tbz</depends_on_package>
 		<depends_on_package_pbi>nmap-6.40_2-amd64.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.40_2 pkg v1.2</version>
+		<version>nmap-6.40_2 pkg v1.2.1</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -1920,7 +1920,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink>
 		<descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr>
 		<category>Security</category>
-		<version>0.2</version>
+		<version>0.2.1</version>
 		<status>Beta</status>
 		<required_version>2.0.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file>