Fixed bug with ACLs for groups with no domain name

diff --git a/dhcpd/acl_security.pl b/dhcpd/acl_security.pl
index 552d204..9a34230 100644 (file)
--- a/dhcpd/acl_security.pl
+++ b/dhcpd/acl_security.pl
@@ -241,6 +241,9 @@ if (!$name && $node->{'name'} eq 'group') {
        if ($dn) {
                $name = $dn->{'values'}->[1];
                }
+       else {
+               $name = $node->{'index'};
+               }
        }
 local $nodetype=$onames{$node->{'name'}};
 local $aclname='ACL'.$nodetype.'_'.$name;

diff --git a/dhcpd/dhcpd-lib.pl b/dhcpd/dhcpd-lib.pl
index aed2ac8..0749d9d 100755 (executable)
--- a/dhcpd/dhcpd-lib.pl
+++ b/dhcpd/dhcpd-lib.pl
@@ -698,7 +698,12 @@ if ($acc->{'per_' . $otype . '_acls'}) {
                local @opts = &find("option", $node->{'members'});
                local ($dn) = grep { $_->{'values'}->[0] eq 'domain-name' }
                                   @opts;
-               $name = $dn->{'values'}->[1] if ($dn);
+               if ($dn) {
+                       $name = $dn->{'values'}->[1];
+                       }
+               else {
+                       $name = $node->{'index'};
+                       }
                }
        local $acl = $acc->{'ACL' . $otype . '_' . $name};
        foreach (@{$rperm}) {