sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Code

r26499: Allow testing python provision by setting the PROVISION_PYTHON environment variable.

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-12-17 08:36:39 +01:00 committed by Stefan Metzmacher
parent 8795697db5
commit 379d0bbb2f
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/scripting/python/samba/provision.py
View File

@ -189,7 +189,6 @@ def ldb_delete(ldb):
ldb.connect(ldb.filename)
def open_ldb(session_info, credentials, dbname):
assert session_info is not None
try:
@ -641,25 +640,16 @@ def provision_guess(lp):
return subobj
def load_schema(setup_dir, subobj, samdb):
"""Load schema."""
src = os.path.join(setup_dir, "schema.ldif")
schema_data = open(src, 'r').read()
src = os.path.join(setup_dir, "schema_samba4.ldif")
schema_data += open(src, 'r').read()
schema_data = substitute_var(schema_data, subobj.subst_vars())
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)

8
source/selftest/env/Samba4.pm vendored
View File

@ -628,8 +628,12 @@ nogroup:x:65534:nobody
my @provision_options = ();
push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\"");
push (@provision_options, "$self->{bindir}/smbscript");
push (@provision_options, "$self->{setupdir}/provision");
if (defined($ENV{PROVISION_PYTHON})) {
push (@provision_options, "$self->{setupdir}/provision.py");
} else {
push (@provision_options, "$self->{bindir}/smbscript");
push (@provision_options, "$self->{setupdir}/provision");
}
push (@provision_options, split(' ', $configuration));
push (@provision_options, "--host-name=$netbiosname");
push (@provision_options, "--host-ip=$ifaceipv4");