From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 27 Aug 2012 06:56:35 +0000 (+1000)
Subject: s4-classicupgrade: Use s3param.get_context() instead of result.lp
X-Git-Tag: samba-4.0.0beta7~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=738f4ac058ab49239271539fe66d09bfa81a138b;p=thirdparty%2Fsamba.git

s4-classicupgrade: Use s3param.get_context() instead of result.lp

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
---

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index f363a9c02dd..32d8326cf95 100644
--- 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('"')