summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-06-16 17:51:42 -0400
committerSimo Sorce <idra@samba.org>2008-06-16 17:52:50 -0400
commit370f95acfc197759f9140876b31ac127d3a0e10c (patch)
treee11a6e07d7cf4678b9331972672c9f3525acfada
parent4a33e5e41b5a03c86758c38ffc1b02dd657962d9 (diff)
downloadsamba-370f95acfc197759f9140876b31ac127d3a0e10c.tar.gz
samba-370f95acfc197759f9140876b31ac127d3a0e10c.tar.bz2
samba-370f95acfc197759f9140876b31ac127d3a0e10c.zip
Try to get a bit further with provisioning
(This used to be commit 649f6c0c1084828dda7d50bd2904208192de77da)
-rw-r--r--source4/scripting/python/samba/provision.py5
-rw-r--r--source4/selftest/target/Samba4.pm2
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3f936c3301..93a4c8f502 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1180,6 +1180,8 @@ def provision_backend(setup_dir=None, message=None,
schemadb = Ldb(schemadb_path, lp=lp)
+ prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
+
setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"),
{"SCHEMADN": names.schemadn,
"ACI": "#",
@@ -1191,7 +1193,8 @@ def provision_backend(setup_dir=None, message=None,
"NETBIOSNAME": names.netbiosname,
"DEFAULTSITE": DEFAULTSITE,
"CONFIGDN": names.configdn,
- "SERVERDN": names.serverdn
+ "SERVERDN": names.serverdn,
+ "PREFIXMAP_B64": b64encode(prefixmap)
})
setup_add_ldif(schemadb, setup_path("schema_samba4.ldif"),
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index bcee926481..77f4862f8a 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -757,7 +757,7 @@ nogroup:x:65534:nobody
if (defined($self->{ldap})) {
push (@provision_options, "--ldap-backend=$ldap_uri");
- system("$self->{bindir}/smbpython $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
+ system("$self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
if ($self->{ldap} eq "openldap") {
($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");