provision: Also walk directories checking ACLs
authorAndrew Bartlett <abartlet@samba.org>
Mon, 5 Nov 2012 04:22:02 +0000 (15:22 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 5 Nov 2012 21:27:44 +0000 (08:27 +1100)
The directory walk was missed due to a cut-and-paste error.

Andrew Bartlett

Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
source4/scripting/python/samba/provision/__init__.py

index b38555608ba5d735291350b1535742961634305f..ba50ff30e6d315eff2171b969caa5c5aaf8832b0 100644 (file)
@@ -1484,7 +1484,7 @@ def check_dir_acl(path, acl, lp, domainsid, direct_db_access):
             if fsacl_sddl != acl:
                 raise ProvisioningError('%s ACL on GPO file %s %s does not match expected value %s from GPO object' % (acl_type(direct_db_access), os.path.join(root, name), fsacl_sddl, acl))
 
             if fsacl_sddl != acl:
                 raise ProvisioningError('%s ACL on GPO file %s %s does not match expected value %s from GPO object' % (acl_type(direct_db_access), os.path.join(root, name), fsacl_sddl, acl))
 
-        for name in files:
+        for name in dirs:
             fsacl = getntacl(lp, os.path.join(root, name), direct_db_access=direct_db_access)
             if fsacl is None:
                 raise ProvisioningError('%s ACL on GPO directory %s %s not found!' % (acl_type(direct_db_access), os.path.join(root, name)))
             fsacl = getntacl(lp, os.path.join(root, name), direct_db_access=direct_db_access)
             if fsacl is None:
                 raise ProvisioningError('%s ACL on GPO directory %s %s not found!' % (acl_type(direct_db_access), os.path.join(root, name)))