summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-12-05 10:35:50 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-12-06 13:28:46 +1100
commit631654ae114ae909228a60de13286922d383f2bb (patch)
tree75131edb218d65693c752cee2c17428525c7cb54
parentbd18d996e2dc3e6b984d20196e9825b8b3f4dea3 (diff)
downloadsamba-631654ae114ae909228a60de13286922d383f2bb.tar.gz
samba-631654ae114ae909228a60de13286922d383f2bb.tar.bz2
samba-631654ae114ae909228a60de13286922d383f2bb.zip
scripting: Handle missing LDAP entries in samba-tool domain classicupgrade
Reported-by: Thomas Simmons <twsnnva@gmail.com>
-rw-r--r--source4/scripting/python/samba/upgrade.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 13d33c1442..df9415e762 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -802,6 +802,8 @@ Please fix this account before attempting to upgrade again
homes[username] = pwd.getpwnam(username).pw_dir
except KeyError:
pass
+ except IndexError:
+ pass
try:
if ldap:
@@ -810,6 +812,8 @@ Please fix this account before attempting to upgrade again
shells[username] = pwd.getpwnam(username).pw_shell
except KeyError:
pass
+ except IndexError:
+ pass
try:
if ldap:
@@ -818,6 +822,8 @@ Please fix this account before attempting to upgrade again
pgids[username] = pwd.getpwnam(username).pw_gid
except KeyError:
pass
+ except IndexError:
+ pass
logger.info("Reading WINS database")
samba3_winsdb = None