diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2011-11-17 16:08:16 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2011-11-18 14:38:28 +1100 |
| commit | e6c77f523b8ed8332ecb4d50a6af7eaa7e6f19af (patch) | |
| tree | 7143265d2f8b72ba86896dfafc263de5b4bf66b7 | |
| parent | 6a2a2dfa5f510fcab964588c29c2991859bbc83f (diff) | |
| download | samba-e6c77f523b8ed8332ecb4d50a6af7eaa7e6f19af.tar.gz samba-e6c77f523b8ed8332ecb4d50a6af7eaa7e6f19af.tar.bz2 samba-e6c77f523b8ed8332ecb4d50a6af7eaa7e6f19af.zip | |
s4-s3-upgrade: Fix idmap types ID_TYPE_UID/ID_TYPE_GID instead of UID/GID
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 53f1206d21..5b0088737c 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -91,7 +91,7 @@ def add_idmap_entry(idmapdb, sid, xid, xid_type, logger): :param idmapdb: Samba4 IDMAP database :param sid: user/group sid :param xid: user/group id - :param xid_type: type of id (UID/GID) + :param xid_type: type of id (ID_TYPE_UID/ID_TYPE_GID) :param logger: Logger object """ @@ -675,7 +675,7 @@ Please fix this account before attempting to upgrade again for g in grouplist: # Ignore uninitialized groups (gid = -1) if g.gid != 0xffffffff: - add_idmap_entry(result.idmap, g.sid, g.gid, "GID", logger) + add_idmap_entry(result.idmap, g.sid, g.gid, "ID_TYPE_GID", logger) add_group_from_mapping_entry(result.samdb, g, logger) # Export users to samba4 backend @@ -685,7 +685,7 @@ Please fix this account before attempting to upgrade again continue s4_passdb.add_sam_account(userdata[username]) if username in uids: - add_idmap_entry(result.idmap, userdata[username].user_sid, uids[username], "UID", logger) + add_idmap_entry(result.idmap, userdata[username].user_sid, uids[username], "ID_TYPE_UID", logger) logger.info("Adding users to groups") for g in grouplist: |