Try to get a bit further with provisioning

(This used to be commit 649f6c0c1084828dda7d50bd2904208192de77da)

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3f936c3301cc2de98bc406c8fc3624c154d0cb9e..93a4c8f50222e6fe76a7c22e31aeea7f11300013 100644 (file)
--- 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 bcee9264818aa6a6fd6db8fe1f5280734f64faae..77f4862f8a717f8e3142c90ad00ac24f31b983bf 100644 (file)
--- 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");