diff options
| author | Richard Connon <richard@connon.me.uk> | 2014-02-04 15:52:48 +0000 |
|---|---|---|
| committer | Richard Connon <richard@connon.me.uk> | 2014-02-04 15:52:48 +0000 |
| commit | a40c7fe2457688fd574558de7b8e31e9c30afb96 (patch) | |
| tree | 8ef84215cf55e3a1afe9bc8112ead82b73d49261 | |
| parent | d19c0ced56af17132e902e1409129dd4ad96afb5 (diff) | |
| download | bcfg2-a40c7fe2457688fd574558de7b8e31e9c30afb96.tar.gz bcfg2-a40c7fe2457688fd574558de7b8e31e9c30afb96.tar.bz2 bcfg2-a40c7fe2457688fd574558de7b8e31e9c30afb96.zip | |
Minor changes to default ACL code
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index 82e7c8fd8..4ef4ae3f5 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -251,14 +251,14 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): aclentry.tag_type = scope try: if scope == posix1e.ACL_USER: + scopename = "user" if qualifier: - scopename = "user" aclentry.qualifier = self._norm_uid(qualifier) else: aclentry.tag_type = posix1e.ACL_USER_OBJ elif scope == posix1e.ACL_GROUP: + scopename = "group" if qualifier: - scopename = "group" aclentry.qualifier = self._norm_gid(qualifier) else: aclentry.tag_type = posix1e.ACL_GROUP_OBJ @@ -610,9 +610,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): qual = pwd.getpwuid(acl.qualifier)[0] elif acl.tag_type == posix1e.ACL_GROUP: qual = grp.getgrgid(acl.qualifier)[0] - elif atype == "access": - return - elif acl.tag_type == posix1e.ACL_MASK: + elif atype == "access" or acl.tag_type == posix1e.ACL_MASK: return except (OSError, KeyError): err = sys.exc_info()[1] @@ -686,6 +684,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): self.logger.debug("POSIX: Unknown ACL scope %s on %s" % (scope, path)) continue + if scope != posix1e.ACL_OTHER: aclentry.set(aclentry.get("scope"), qual) entry.append(aclentry) |