Changeset 2317

Timestamp:

12/04/19 09:27:46 (4 years ago)

Author:

nanardon

Message:

Dump also default ACL

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Acls.pm (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Acls.pm

@@ -175 +175 @@
     $attr =~ /^@(CREATE|DELETE)$/ && $perm eq 'r' and return;
 
-    foreach my $acl (@{$self->{_acls}}) {
+    foreach my $acl (@{$self->{_acls}}, @{$self->{_default_acls}}) {
         my $res = $acl->match($obj, $attr, $perm, $who, $groups);
         defined($res) and return $res;
     }
-    foreach my $acl (@{$self->{_default_acls}}) {
-        my $res = $acl->match($obj, $attr, $perm, $who, $groups);
-        defined($res) and return $res;
-    }
 
     return 0;
@@ -195 +191 @@
 sub dump {
     my ($self) = @_;
-    foreach my $acl (@{$self->{_acls}}) {
+    foreach my $acl (@{$self->{_acls}}, @{$self->{_default_acls}}) {
         print $acl->dump, "\n";
     }