git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a2a2df
)
s4-s3-upgrade: Fix idmap types ID_TYPE_UID/ID_TYPE_GID instead of UID/GID
author
Amitay Isaacs
<amitay@gmail.com>
Thu, 17 Nov 2011 05:08:16 +0000
(16:08 +1100)
committer
Amitay Isaacs
<amitay@gmail.com>
Fri, 18 Nov 2011 03:38:28 +0000
(14:38 +1100)
source4/scripting/python/samba/upgrade.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/upgrade.py
b/source4/scripting/python/samba/upgrade.py
index 53f1206d21636d0ef93d6a32ba2bb26b72fc897e..5b0088737cb9177cde8195b3c1d23fa1d187da99 100644
(file)
--- 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 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
"""
: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:
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
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:
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:
logger.info("Adding users to groups")
for g in grouplist: