diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-07-05 00:34:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:59:06 -0500 |
| commit | c37cfae81e6f87feecb0737cb7e646c9a7da1114 (patch) | |
| tree | a9edbb13b207d31c500f93045c1917d22087ab2e /source4/setup/provision | |
| parent | 3a78f7323a986703c9b7100f551b1c907a9e104b (diff) | |
| download | samba-c37cfae81e6f87feecb0737cb7e646c9a7da1114.tar.gz samba-c37cfae81e6f87feecb0737cb7e646c9a7da1114.tar.bz2 samba-c37cfae81e6f87feecb0737cb7e646c9a7da1114.zip | |
r23715: Make the provision-backend script print out the exact commands to run,
to set up the LDAP backend.
Andrew Bartlett
(This used to be commit cc7900210a2e473060d5897ec729923ac6b2f18d)
Diffstat (limited to 'source4/setup/provision')
| -rwxr-xr-x | source4/setup/provision | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index 8e67dd4b3c..175ed8f161 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -121,13 +121,19 @@ var ldapbase = (options["ldap-base"] != undefined); var ldapbackend = (options["ldap-backend"] != undefined); var ldapmodule = (options["ldap-module"] != undefined); var partitions_only = (options["partitions-only"] != undefined); +var paths = provision_default_paths(subobj); if (options["aci"] != undefined) { message("set ACI: %s\n", subobj["ACI"]); } message("set DOMAIN SID: %s\n", subobj["DOMAINSID"]); +provision_fix_subobj(subobj, paths); + if (ldapbackend) { + if (options["ldap-backend"] == "ldapi") { + subobj.LDAPBACKEND = subobj.LDAPI_URI; + } if (!ldapmodule) { subobj.LDAPMODULE = "entryUUID"; } @@ -137,7 +143,7 @@ if (ldapbackend) { subobj.CONFIGDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; subobj.SCHEMADN_LDB = subobj.LDAPBACKEND; subobj.SCHEMADN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; - message("LDAP module: %s backend: %s\n", subobj.LDAPMODULE, subobj.LDAPBACKEND); + message("LDAP module: %s on backend: %s\n", subobj.LDAPMODULE, subobj.LDAPBACKEND); } if (!provision_validate(subobj, message)) { @@ -146,7 +152,6 @@ if (!provision_validate(subobj, message)) { var system_session = system_session(); var creds = options.get_credentials(); -var paths = provision_default_paths(subobj); message("Provisioning for %s in realm %s\n", subobj.DOMAIN, subobj.REALM); message("Using administrator password: %s\n", subobj.ADMINPASS); if (ldapbase) { |