webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

zoneconf: Fix bug that resultet from last fix

Browse Source 
Fix bug that prevents users from assigning NIC to RED if RED is in PPP
mode
This commit is contained in:
Florian Bührle
2019-05-11 14:38:39 +02:00
parent f60b61e04d
commit a6695868d0
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
html/cgi-bin/zoneconf.cgi
View File

@@ -166,10 +166,6 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
my $VALIDATE_vlancount = 0;
my $VALIDATE_zoneslaves = 0;
if ($zone_mode eq "") { # If this zone is not activated, we don't check it
next;
}
$ethsettings{"${uc}_MACADDR"} = "";
$ethsettings{"${uc}_MODE"} = "";
$ethsettings{"${uc}_SLAVES"} = "";
@@ -203,13 +199,13 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
my $mac = $_->[0];
my $nic_access = $cgiparams{"ACCESS $uc $mac"};
if (! ($nic_access eq "NONE")) {
if ($nic_access ne "NONE") {
if ($VALIDATE_nic_check{"RESTRICT $mac"}) { # If this interface is already assigned to RED in PPP mode, throw an error
$VALIDATE_error = $Lang::tr{"zoneconf val ppp assignment error"};
last;
}
if ($zone_mode ne "BRIDGE" && $VALIDATE_zoneslaves > 0) {
if ($zone_mode ne "BRIDGE" && $VALIDATE_zoneslaves > 0 && $nic_access ne "") {
$VALIDATE_error = $Lang::tr{"zoneconf val zoneslave amount error"};
last;
}