From: Andrew Bartlett Date: Mon, 3 Sep 2012 08:50:16 +0000 (+1000) Subject: s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID X-Git-Tag: samba-4.0.0rc1~276 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dd0e7141f24a4e92e165c3aadaaa3a97eb26712;p=thirdparty%2Fsamba.git s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID --- diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index d3f0b8de168..6b6a188fa8a 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"):