From 2c047198caccea30e8583dda869d513913fe1702 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 11 Apr 2013 09:33:16 +1000 Subject: python-samba-tool domain classicupgrade: Actually Skip domain trust accounts Reviewed-by: Stefan Metzmacher --- python/samba/upgrade.py | 1 + 1 file changed, 1 insertion(+) (limited to 'python') 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) -- cgit