s4-provision: added setup_path() import in two more places
authorAndrew Tridgell <tridge@samba.org>
Mon, 7 Feb 2011 00:54:31 +0000 (11:54 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 7 Feb 2011 02:22:02 +0000 (13:22 +1100)
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

source4/scripting/bin/upgradeprovision
source4/scripting/python/samba/provision/backend.py

index ff15dc5f55b4ce65e387296089195bae7e6ad004..5b09ce6d32cfc769558cb33295283613f9fa115e 100755 (executable)
@@ -47,7 +47,7 @@ from samba import param, dsdb, Ldb
 from samba.provision import (get_domain_descriptor,
                             get_config_descriptor,
                             ProvisioningError, get_last_provision_usn,
-                            get_max_usn, update_provision_usn)
+                            get_max_usn, update_provision_usn, setup_path)
 from samba.schema import get_linked_attributes, Schema, get_schema_descriptor
 from samba.dcerpc import security, drsblobs, xattr
 from samba.ndr import ndr_unpack
index 0ab389b483a71f70791bff370c4c0e508c21453a..f9dbba85f6f3fc539a0c526b6f0646b533ed0327 100644 (file)
@@ -571,6 +571,8 @@ class FDSBackend(LDAPBackend):
             ldap_backend_extra_port=None, ldap_dryrun_mode=False, root=None,
             setup_ds_path=None):
 
+        from samba.provision import setup_path
+
         super(FDSBackend, self).__init__(backend_type=backend_type,
                 paths=paths, lp=lp,
                 credentials=credentials, names=names, logger=logger,