aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/nrpe2/nrpe2.inc5
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 6 insertions, 5 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) {
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>
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>
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>