Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

diff --git a/source/scripting/python/samba/upgrade.py b/source/scripting/python/samba/upgrade.py
index a118af25265939defb6414ba7d3872a2d608314d..b332bb89aed95b440d57f887feeaf833d68f48c1 100644 (file)
--- a/source/scripting/python/samba/upgrade.py
+++ b/source/scripting/python/samba/upgrade.py
@@ -246,8 +246,8 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
         machinepass = None
     
     domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, 
-                         samdb_fill=FILL_DRS, ldapbackend=None, 
-                         paths=paths, session_info=session_info, credentials=credentials, realm=realm, 
+                         samdb_fill=FILL_DRS, paths=paths, session_info=session_info, 
+                         credentials=credentials, realm=realm, 
                          domain=domainname, domainsid=domainsid, domainguid=domainguid, 
                          machinepass=machinepass, serverrole=serverrole)