summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/POSIX/base.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-12 09:21:13 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-12 09:21:13 -0400
commit5f98fa9d7cf175d565905189018a758adc1431b5 (patch)
tree038ee65ddd0b68000c88931f0fb335339802cdc9 /src/lib/Bcfg2/Client/Tools/POSIX/base.py
parent18701bbeb2858e08d3d6755b5335a756ed20c5ca (diff)
downloadbcfg2-5f98fa9d7cf175d565905189018a758adc1431b5.tar.gz
bcfg2-5f98fa9d7cf175d565905189018a758adc1431b5.tar.bz2
bcfg2-5f98fa9d7cf175d565905189018a758adc1431b5.zip
Remove all ACLs (including mask) from entries with no ACLs listed
When installing an entry with no ACLs specified, but with ACLs on the file as it exists on the filesystem, the ACL mask was preserved, even as the ACLs are deleted.
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/base.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/base.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index 1e73d4f11..85da3576b 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -232,6 +232,11 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
else:
defacl = None
+ if not acls:
+ self.logger.debug("POSIX: Removed ACLs from %s" %
+ entry.get("name"))
+ return True
+
for aclkey, perms in acls.items():
atype, scope, qualifier = aclkey
if atype == "default":