summaryrefslogtreecommitdiff
path: root/source4/scripting/python/samba/provision.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-17 12:07:51 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:51:09 +0100
commitf89c7a6e5eb082794d64b487e69fc442d138ca28 (patch)
tree3e53b034b4a3424d3c56c07797f33c478004fe75 /source4/scripting/python/samba/provision.py
parentc2604542295d5665172019da829544202ff034d6 (diff)
downloadsamba-f89c7a6e5eb082794d64b487e69fc442d138ca28.tar.gz
samba-f89c7a6e5eb082794d64b487e69fc442d138ca28.tar.bz2
samba-f89c7a6e5eb082794d64b487e69fc442d138ca28.zip
r26505: Add python bindings for some samdb-related functions, improve provisioning in python.
(This used to be commit d2402251666738c0372bbbaeaa1d26c06e254033)
Diffstat (limited to 'source4/scripting/python/samba/provision.py')
-rw-r--r--source4/scripting/python/samba/provision.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 5332a9f9ff..34191b7269 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -433,10 +433,8 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
message("Pre-loading the Samba 4 and AD schema")
- samdb = open_ldb(session_info, credentials, paths.samdb)
-
+ samdb = SamDB(paths.samdb, session_info, credentials)
samdb.set_domain_sid(subobj.domainsid)
-
load_schema(setup_dir, subobj, samdb)
samdb.transaction_start()
@@ -650,7 +648,7 @@ def load_schema(setup_dir, subobj, samdb):
src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
head_data = open(src, 'r').read()
head_data = substitute_var(head_data, subobj.subst_vars())
- samdb.attach_dsdb_schema_from_ldif(head_data, schema_data)
+ samdb.attach_schema_from_ldif(head_data, schema_data)
def join_domain(domain, netbios_name, join_type, creds, message):