samba-tool domain classicupgrade: Fix typo in error path for multiple account flags
authorAndrew Bartlett <abartlet@samba.org>
Mon, 11 Feb 2013 22:20:03 +0000 (09:20 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 2 Mar 2013 20:52:19 +0000 (21:52 +0100)
Reviewed-by: Stefan Metzmacher <metze@samba.org>
python/samba/upgrade.py

index e013d2c831aa931fb129901180237ef965c6b3d3..83712242fe294f4484223b27cb8341140e2dfa0d 100644 (file)
@@ -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