summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-03 18:50:16 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-09-03 19:24:10 +1000
commit2dd0e7141f24a4e92e165c3aadaaa3a97eb26712 (patch)
tree1f8bf8805f89835975bb61370f1fca5c7ae5929b
parent3b3d7bb6029bf7c89abec0fb0b455a6154b0d0bf (diff)
downloadsamba-2dd0e7141f24a4e92e165c3aadaaa3a97eb26712.tar.gz
samba-2dd0e7141f24a4e92e165c3aadaaa3a97eb26712.tar.bz2
samba-2dd0e7141f24a4e92e165c3aadaaa3a97eb26712.zip
s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID
-rw-r--r--source4/scripting/python/samba/upgrade.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index d3f0b8de16..6b6a188fa8 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -869,6 +869,7 @@ Please fix this account before attempting to upgrade again
for username in userdata:
if username.lower() == 'administrator':
if userdata[username].user_sid != dom_sid(str(domainsid) + "-500"):
+ logger.error("User 'Administrator' in your existing directory has SID %s, expected it to be %s" % (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"):