summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2011-08-19 12:33:15 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-19 16:35:10 +1000
commit149845fb18e016f8e8e8a415f936b62278b83fc0 (patch)
treedc1e7a5c5cc3504d40a269f55ae004d0fc555dcc
parent0ffb4e6f6f1db61bf4f2ec73c1cad5e102787f67 (diff)
downloadsamba-149845fb18e016f8e8e8a415f936b62278b83fc0.tar.gz
samba-149845fb18e016f8e8e8a415f936b62278b83fc0.tar.bz2
samba-149845fb18e016f8e8e8a415f936b62278b83fc0.zip
s3_upgrade: Do not add administrator and root accounts from s3 to s4
Need to copy the password from s3 for administrator/root to s4. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/scripting/python/samba/upgrade.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 6226681830..ed13d101e9 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -637,6 +637,8 @@ def upgrade_from_samba3(samba3, logger, session_info, smbconf, targetdir):
# Export users to samba4 backend
logger.info("Importing users")
for username in userdata:
+ if username.lower() == 'administrator' or username.lower() == 'root':
+ continue
new_passdb.add_sam_account(userdata[username])
if username in uids:
add_idmap_entry(result.idmap, userdata[username].user_sid, uids[username], "UID", logger)