summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-04-11 09:33:16 +1000
committerStefan Metzmacher <metze@samba.org>2013-05-16 19:02:01 +0200
commit2c047198caccea30e8583dda869d513913fe1702 (patch)
tree89f3427cfd4fe26bb75e327b8ea83a39650548f7
parent2e1f14355c162dde0190ac2cb105a34607134e02 (diff)
downloadsamba-2c047198caccea30e8583dda869d513913fe1702.tar.gz
samba-2c047198caccea30e8583dda869d513913fe1702.tar.bz2
samba-2c047198caccea30e8583dda869d513913fe1702.zip
python-samba-tool domain classicupgrade: Actually Skip domain trust accounts
Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--python/samba/upgrade.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index df5ab41021..804ef506da 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -704,6 +704,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None,
elif acct_type == samr.ACB_DOMTRUST:
logger.warn(" Skipping inter-domain trust from domain %s, this trust must be re-created as an AD trust" % username[:-1])
+ continue
elif acct_type == (samr.ACB_WSTRUST) and username[-1] != '$':
logger.warn(" Skipping account %s that has ACB_WSTRUST (W) set but does not end in $. This account can not have worked, and is probably left over from a misconfiguration." % username)