summaryrefslogtreecommitdiff
path: root/source4/setup/provision-backend
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-01-17 12:00:27 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-01-17 12:00:27 +1100
commitf1e177a7b8e660b245d5fb9b11a66b43c9b69784 (patch)
tree2bb54eec3573ae3d0fd5abf6aa34710431264ecb /source4/setup/provision-backend
parentb44f322f5d5940cb61b2f9c9e44fc25ed00e81be (diff)
downloadsamba-f1e177a7b8e660b245d5fb9b11a66b43c9b69784.tar.gz
samba-f1e177a7b8e660b245d5fb9b11a66b43c9b69784.tar.bz2
samba-f1e177a7b8e660b245d5fb9b11a66b43c9b69784.zip
provision: simplfy by removing old code to manually create baseDNs.
Previously, we would create the first record in the DB as an LDIF file, with the expectation that the administrator would use slapadd to create the database. We now do everything over LDAP, which is far simpler, and allows the LDB module chain to do its work, without special cases. Also fix naming of the output schema when suggesting the comamnd line to run ad2oLschema in provision-backend. Andrew Bartlett (This used to be commit e77375758d66e94e5e0b6e61a97c9281c3d9c71f)
Diffstat (limited to 'source4/setup/provision-backend')
-rwxr-xr-xsource4/setup/provision-backend5
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 6582587624..abd1b9a875 100755
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -101,7 +101,7 @@ var backend_schema;
var slapd_command;
if (options["ldap-backend-type"] == "fedora-ds") {
mapping = "schema-map-fedora-ds-1.0";
- backend_schema = "backend-schema.ldif";
+ backend_schema = "99_ad.ldif";
if (options["ldap-backend-port"] != undefined) {
message("Will listen on TCP port " + options["ldap-backend-port"] + "\n");
subobj.SERVERPORT="ServerPort = " + options["ldap-backend-port"];
@@ -114,9 +114,8 @@ if (options["ldap-backend-type"] == "fedora-ds") {
slapd_command = "(see documentation)";
} else if (options["ldap-backend-type"] == "openldap") {
- provision_ldapbase(subobj, message, paths);
mapping = "schema-map-openldap-2.3";
- backend_schema = "99_ad.ldif";
+ backend_schema = "backend-schema.schema";
setup_file("slapd.conf", message, subobj.LDAPDIR + "/slapd.conf", subobj);
setup_file("modules.conf", message, subobj.LDAPDIR + "/modules.conf", subobj);
sys.mkdir(subobj.LDAPDIR + "/db", 0700);