diff options
| -rw-r--r-- | src/usr/local/www/firewall_aliases_edit.php | 9 | ||||
| -rwxr-xr-x | src/usr/local/www/interfaces.php | 9 | ||||
| -rw-r--r-- | src/usr/local/www/interfaces_groups_edit.php | 8 |
3 files changed, 22 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 161960b..9a82a58 100644 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -173,6 +173,15 @@ if ($_POST) { } } + /* + * Packages (e.g. tinc) create interface groups, reserve this + * namespace pkg_ for them. + * One namespace is shared by Interfaces, Interface Groups and Aliases. + */ + if (substr($_POST['name'], 0, 4) == 'pkg_') { + $input_errors[] = gettext("The alias name cannot start with pkg_"); + } + /* check for name interface description conflicts */ foreach ($config['interfaces'] as $interface) { if (strcasecmp($interface['descr'], $_POST['name']) == 0) { diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index f19ee43..108de24 100755 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -524,6 +524,15 @@ if ($_POST['apply']) { if (is_numeric($_POST['descr'])) { $input_errors[] = gettext("The interface description cannot contain only numbers."); } + + /* + * Packages (e.g. tinc) create interface groups, reserve this + * namespace pkg_ for them. + * One namespace is shared by Interfaces, Interface Groups and Aliases. + */ + if (substr($_POST['descr'], 0, 4) == 'pkg_') { + $input_errors[] = gettext("The interface description cannot start with pkg_"); + } } if (isset($config['dhcpd']) && isset($config['dhcpd'][$if]['enable'])) { diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index 434de73..daa0348 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -88,11 +88,11 @@ if ($_POST) { } /* - * Packages (e.g. tinc) creates interface groups, reserve this - * namespace pkg- for them + * Packages (e.g. tinc) create interface groups, reserve this + * namespace pkg_ for them */ - if (substr($_POST['ifname'], 0, 4) == 'pkg-') { - $input_errors[] = gettext("Group name cannot start with pkg-"); + if (substr($_POST['ifname'], 0, 4) == 'pkg_') { + $input_errors[] = gettext("Group name cannot start with pkg_"); } foreach ($interface_list_disabled as $gif => $gdescr) { |
