git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ed6070
)
s4-classicupgrade: Use s3param.get_context() instead of result.lp
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 27 Aug 2012 06:56:35 +0000
(16:56 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Mon, 27 Aug 2012 21:57:29 +0000
(07:57 +1000)
We should not need the guessed values here, but by changing to using the s3 loadparm context
we can move this block to before the provision.
Andrew Bartlett
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 f363a9c02ddffa29915cbb1fbd7a217ff419986a..32d8326cf95d37ff92cd8531b7e03167761bf749 100644
(file)
--- a/
source4/scripting/python/samba/upgrade.py
+++ b/
source4/scripting/python/samba/upgrade.py
@@
-810,7
+810,7
@@
Please fix this account before attempting to upgrade again
pgids = {}
if ldap:
creds = Credentials()
- creds.guess(
result.lp
)
+ creds.guess(
s3param.get_context()
)
creds.set_bind_dn(ldapuser)
creds.set_password(ldappass)
urls = samba3.lp.get("passdb backend").split(":",1)[1].strip('"')