From f287c8845a766aae5a9d73ad93c44b44d7f8963d Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 20 Nov 2015 10:32:25 +0100
Subject: Tighten the input validation to make sure 'Bind IP Address' is
 configured on the local system

---
 config/nrpe2/nrpe2.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc
index 5a23a585..182664b8 100644
--- a/config/nrpe2/nrpe2.inc
+++ b/config/nrpe2/nrpe2.inc
@@ -29,6 +29,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("filter.inc");
+require_once("pfsense-utils.inc");
 require_once("pkg-utils.inc");
 require_once("util.inc");
 
@@ -245,8 +246,8 @@ function nrpe2_custom_php_validation_command($post, &$input_errors) {
 		$input_errors[] = gettext("'Port Number' must be a valid port.");
 	}
 	if ($post['server_address'] != "") {
-		if (!is_ipaddr($post['server_address'])) {
-			$input_errors[] = gettext("'Bind IP Address' must be a valid IP address.");
+		if (!is_ipaddr_configured($post['server_address']) && !preg_match("/(127.0.0.1|0.0.0.0)/", $post['server_address'])) {
+			$input_errors[] = gettext("'Bind IP Address' is not a valid, locally configured IP address.");
 		}
 	}
 	foreach (explode(",", $post['allowed_hosts']) as $host) {
-- 
cgit v1.2.3


From 894509d85be9355102e9a0275f2052bdc92d4b98 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 20 Nov 2015 10:33:25 +0100
Subject: Bump nrpe2 package version

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 5c1ae042..22755019 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1352,7 +1352,7 @@
 		</build_pbi>
 		<build_options>nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
-		<version>2.2.6</version>
+		<version>2.2.7</version>
 		<status>BETA</status>
 		<required_version>2.2.1</required_version>
 		<maintainer>erik@erikkristensen.com</maintainer>
-- 
cgit v1.2.3


From 2c3bad284d0c380890ba9d53b2fd776d5ab28e19 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 20 Nov 2015 10:34:03 +0100
Subject: Bump nrpe2 package version

---
 pkg_config.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 3dd9bd89..a081c1be 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1454,7 +1454,7 @@
 		</build_pbi>
 		<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
-		<version>2.13_2 pkg v2.2.6</version>
+		<version>2.13_2 pkg v2.2.7</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<maintainer>erik@erikkristensen.com</maintainer>
-- 
cgit v1.2.3


From 1afb016d3f5d8b5db0d69c3bb018a535c1dcb796 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Fri, 20 Nov 2015 10:35:21 +0100
Subject: Bump nrpe2 package version

---
 pkg_config.8.xml.amd64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index b3ccdf01..7113b826 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1441,7 +1441,7 @@
 		</build_pbi>
 		<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
-		<version>2.13_2 pkg v2.2.6</version>
+		<version>2.13_2 pkg v2.2.7</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<maintainer>erik@erikkristensen.com</maintainer>
-- 
cgit v1.2.3