git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd18d99
)
scripting: Handle missing LDAP entries in samba-tool domain classicupgrade
author
Andrew Bartlett
<abartlet@samba.org>
Tue, 4 Dec 2012 23:35:50 +0000
(10:35 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Thu, 6 Dec 2012 02:28:46 +0000
(13:28 +1100)
Reported-by: Thomas Simmons <twsnnva@gmail.com>
source4/scripting/python/samba/upgrade.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/upgrade.py
b/source4/scripting/python/samba/upgrade.py
index 13d33c14422b5ee739ed7a1887a20e69c6823c92..df9415e76232206b5d72e12198d59d5a12ba0093 100644
(file)
--- 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