s4:provision - Moved provision_xxx_backend() into backend-specific provision() method.

[samba.git] / source4 / scripting / python / samba / provision.py

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 1c194c042c7f90d8e19012c932e98f84b4f42fb9..e40603a0b0c2c0721c21d4574ec25947ff0b042d 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1261,7 +1261,7 @@ def provision(setup_dir, message, session_info,
                                          setup_ds_path=setup_ds_path,
                                          ldap_dryrun_mode=ldap_dryrun_mode,
                                          domainsid=domainsid)
-    else:
+    elif backend_type == "ldb" or backend_type == "existing":
         provision_backend = ProvisionBackend(backend_type,
                                          paths=paths, setup_path=setup_path,
                                          lp=lp, credentials=credentials, 
@@ -1275,7 +1275,10 @@ def provision(setup_dir, message, session_info,
                                          setup_ds_path=setup_ds_path,
                                          ldap_dryrun_mode=ldap_dryrun_mode,
                                          domainsid=domainsid)
+    else:
+        raise ProvisioningError("Unknown LDAP backend type selected")
 
+    provision_backend.provision()
     provision_backend.start()
 
     # only install a new shares config db if there is none