summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-02-12 09:20:03 +1100
committerAndrew Bartlett <abartlet@samba.org>2013-03-02 21:52:19 +0100
commit161fa15697fab9effbe1db9640cece847dcf63cd (patch)
treee31dff138bf87c9764bf8652d6a1f200e219292a
parent669c302f2d78ab4bbd35982373ae079246c8979d (diff)
downloadsamba-161fa15697fab9effbe1db9640cece847dcf63cd.tar.gz
samba-161fa15697fab9effbe1db9640cece847dcf63cd.tar.bz2
samba-161fa15697fab9effbe1db9640cece847dcf63cd.zip
samba-tool domain classicupgrade: Fix typo in error path for multiple account flags
Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--python/samba/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index e013d2c831..83712242fe 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -722,7 +722,7 @@ ACB_NORMAL (N, 0x%08X), ACB_WSTRUST (W 0x%08X), ACB_SVRTRUST (S 0x%08X) or ACB_D
Please fix this account before attempting to upgrade again
"""
- % (user.acct_flags, username,
+ % (username, user.acct_ctrl,
samr.ACB_NORMAL, samr.ACB_WSTRUST, samr.ACB_SVRTRUST, samr.ACB_DOMTRUST))
userdata[username] = user