diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup')
| -rw-r--r-- | rdiff-backup/rdiff_backup/eas_acls.py | 13 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/user_group.py | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/rdiff-backup/rdiff_backup/eas_acls.py b/rdiff-backup/rdiff_backup/eas_acls.py index 709f324..6b74ac4 100644 --- a/rdiff-backup/rdiff_backup/eas_acls.py +++ b/rdiff-backup/rdiff_backup/eas_acls.py @@ -458,24 +458,15 @@ def list_to_acl(entry_list, map_names = 1): "trigger further warnings" % (name,), 2) dropped_acl_names[name] = name - def map_id_name(owner_pair, group = None): - """Return id of mapped id and user given original owner_pair""" - id, name = owner_pair - Map = group and user_group.GroupMap or user_group.UserMap - if name: return Map.get_id_from_name(name) - else: - assert id is not None - return Map.get_id_from_id(id) - acl = posix1e.ACL() for typechar, owner_pair, perms in entry_list: id = None if owner_pair: if map_names: - if typechar == "u": id = map_id_name(owner_pair, 0) + if typechar == "u": id = user_group.acl_user_map(*owner_pair) else: assert typechar == "g", (typechar, owner_pair, perms) - id = map_id_name(owner_pair, 1) + id = user_group.acl_group_map(*owner_pair) if id is None: warn_drop(owner_pair[1]) continue diff --git a/rdiff-backup/rdiff_backup/user_group.py b/rdiff-backup/rdiff_backup/user_group.py index 186e1b6..39b27e1 100644 --- a/rdiff-backup/rdiff_backup/user_group.py +++ b/rdiff-backup/rdiff_backup/user_group.py @@ -155,7 +155,7 @@ class NumericalMap: def map_acl(self, id, name = None): return id -############ Public section - don't use outside user_group ########### +############ Public section - can use these outside user_group ########### def uid2uname(uid): @@ -213,3 +213,5 @@ def map_rpath(rp): uname, gname = rp.getuname(), rp.getgname() return (UserMap(uid, uname), GroupMap(gid, gname)) +def acl_user_map(uid, uname): return UserMap.map_acl(uid, uname) +def acl_group_map(gid, gname): return GroupMap.map_acl(gid, gname) |