sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-s3upgrade: Assert that administrator has a SID of -500, and only skip root if it is -500

Browse Source 
Many upgraded installations have root as -1000, and so that account needs to be kept.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-06-16 14:19:42 +10:00
parent 61f7f01554
commit b58dc1826e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source4/scripting/python/samba/upgrade.py
View File

@ -746,8 +746,15 @@ Please fix this account before attempting to upgrade again
# Export users to samba4 backend
logger.info("Importing users")
for username in userdata:
if username.lower() == 'administrator' or username.lower() == 'root':
continue
if username.lower() == 'administrator':
if userdata[username].user_sid != dom_sid(str(domainsid) + "-500"):
raise ProvisioningError("User 'Administrator' in your existing directory does not have SID ending in -500")
if username.lower() == 'root':
if userdata[username].user_sid == dom_sid(str(domainsid) + "-500"):
logger.warn('User root has been replaced by Administrator')
else:
logger.warn('User root has been kept in the directory, it should be removed in favour of the Administrator user')
s4_passdb.add_sam_account(userdata[username])
if username in uids:
add_ad_posix_idmap_entry(result.samdb, userdata[username].user_sid, uids[username], "ID_TYPE_UID", logger)