diff --git a/Netdisco/lib/App/Netdisco/Util/Device.pm b/Netdisco/lib/App/Netdisco/Util/Device.pm index 943c9135..ba5d94c4 100644 --- a/Netdisco/lib/App/Netdisco/Util/Device.pm +++ b/Netdisco/lib/App/Netdisco/Util/Device.pm @@ -171,17 +171,14 @@ Regular Expression in YAML format which will match the device DNS name, e.g.: =item * -C<"model:regex"> - matched against the device model - -=item * - -C<"vendor:regex"> - matched against the device vendor +C<"property:regex"> - matched against a device property, such as C or C =back -To simply match all devices, use "C" or IP Prefix "C<0.0.0.0/0>". All -regular expressions are anchored (that is, they must match the whole string). -To match no devices we recommend an entry of "C" in the setting. +To simply match all devices, use "C" or IP Prefix "C<0.0.0.0/0>". +Property regular expressions are anchored (that is, they must match the whole +string). To match no devices we recommend an entry of "C" in the +setting. =cut @@ -225,17 +222,14 @@ Regular Expression in YAML format which will match the device DNS name, e.g.: =item * -C<"model:regex"> - matched against the device model - -=item * - -C<"vendor:regex"> - matched against the device vendor +C<"property:regex"> - matched against a device property, such as C or C =back -To simply match all devices, use "C" or IP Prefix "C<0.0.0.0/0>". All -regular expressions are anchored (that is, they must match the whole string). -To match no devices we recommend an entry of "C" in the setting. +To simply match all devices, use "C" or IP Prefix "C<0.0.0.0/0>". +Property regular expressions are anchored (that is, they must match the whole +string). To match no devices we recommend an entry of "C" in the +setting. =cut diff --git a/Netdisco/lib/App/Netdisco/Util/Permission.pm b/Netdisco/lib/App/Netdisco/Util/Permission.pm index 1d9c5d7b..8b97b6d3 100644 --- a/Netdisco/lib/App/Netdisco/Util/Permission.pm +++ b/Netdisco/lib/App/Netdisco/Util/Permission.pm @@ -5,6 +5,7 @@ use Dancer::Plugin::DBIC 'schema'; use Scalar::Util 'blessed'; use NetAddr::IP::Lite ':lower'; +use App::Netdisco::Util::DNS 'hostname_from_ip'; use base 'Exporter'; our @EXPORT = ();