From a6695868d0a8bb05b587d574669e359df21dde34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20B=C3=BChrle?= Date: Sat, 11 May 2019 14:38:39 +0200 Subject: [PATCH] zoneconf: Fix bug that resultet from last fix Fix bug that prevents users from assigning NIC to RED if RED is in PPP mode --- html/cgi-bin/zoneconf.cgi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index adb3d29676..3712b92cde 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -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; } -- 2.39.2