Merge pull request #7605 from inverse-inc/fix/7604

Skip switch type PacketFence
inverse-inc · Mar 22, 2023 · 9eb449a · 9eb449a
2 parents 42d0607 + 517f62e
commit 9eb449a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Roles.pm b/html/pfappserver/lib/pfappserver/Form/Config/Roles.pm
@@ -149,7 +149,7 @@ sub validate {
     $acls = [split(/\n/, $acls)];
     while (my ($switch_id, $data) = each %pf::SwitchFactory::SwitchConfig) {
         my $type = $data->{type};
-        next if !defined $type || $type eq '';
+        next if !defined $type || $type eq '' || $type eq 'PacketFence';
         my $module = pf::SwitchFactory::getModule($type);
         next if !defined $module;
         my $switch = $module->new({ id => $switch_id, %$data});

diff --git a/lib/pf/Switch.pm b/lib/pf/Switch.pm
@@ -3966,6 +3966,10 @@ sub ACLsLimit {
 
 sub checkRoleACLs {
     my ($self, $name, $acls) = @_;
+    if (($self->{_type} // '') eq 'PacketFence') {
+        return undef;
+    }
+
     my $count = @{$acls // []};
 
     if ($count == 0) {