Fix provision python test.

[ira/wip.git] / source / setup / provision.py

diff --git a/source/setup/provision.py b/source/setup/provision.py
index c8087f7bd7fa82ed15c23513e1a9ac7bdcc4a5b2..033d2491f2152ab4ddbd5af79cd70a33b690f36f 100755 (executable)
--- a/source/setup/provision.py
+++ b/source/setup/provision.py
@@ -26,9 +26,6 @@ import getopt
 import optparse
 import os, sys
 
-# Add path to the library for in-tree use
-sys.path.append("scripting/python")
-
 import samba
 
 from auth import system_session
@@ -130,12 +127,12 @@ lp.set("realm", opts.realm)
 lp.set("workgroup", opts.domain)
 lp.set("server role", opts.server_role or "domain controller")
 
-
 if opts.aci is not None:
        print "set ACI: %s" % opts.aci
 
-paths = provision_paths_from_lp(lp, opts.realm.lower(), private_dir)
-paths.smbconf = sambaopts.get_loadparm_path()
+paths = provision_paths_from_lp(lp, opts.realm.lower())
+if sambaopts.get_loadparm_path() is not None:
+    paths.smbconf = sambaopts.get_loadparm_path()
 
 creds = credopts.get_credentials()
 
@@ -150,7 +147,7 @@ elif opts.partitions_only:
     samdb_fill = FILL_DRS
 
 provision(lp, setup_dir, message, paths, 
-          system_session(), creds, opts.ldap_backend, 
+          system_session(), creds, 
           samdb_fill=samdb_fill, realm=opts.realm,
           domainguid=opts.domain_guid, domainsid=opts.domain_sid,
           policyguid=opts.policy_guid, hostname=opts.host_name,