diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-07-04 11:06:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:59:06 -0500 |
| commit | 3a78f7323a986703c9b7100f551b1c907a9e104b (patch) | |
| tree | f2e07813d610d629e5e32f2740dce721a576c1de /source4/setup | |
| parent | 4ace7950d4fbd074611865eee816e748c56b7b83 (diff) | |
| download | samba-3a78f7323a986703c9b7100f551b1c907a9e104b.tar.gz samba-3a78f7323a986703c9b7100f551b1c907a9e104b.tar.bz2 samba-3a78f7323a986703c9b7100f551b1c907a9e104b.zip | |
r23703: Start to get Samba4 to again work with LDAP backends, after I turned
on metze's schema work.
Andrew Bartlett
(This used to be commit 3111bbdf64f57bf8d2638fd9829c071dcfeb4af1)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision | 15 | ||||
| -rwxr-xr-x | source4/setup/provision-backend | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index 9a67d06963..8e67dd4b3c 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -129,14 +129,15 @@ message("set DOMAIN SID: %s\n", subobj["DOMAINSID"]); if (ldapbackend) { if (!ldapmodule) { - subobj["LDAPMODULE"] = "entryUUID"; + subobj.LDAPMODULE = "entryUUID"; } - subobj["DOMAINDN_LDB"] = subobj["LDAPBACKEND"]; - subobj["DOMAINDN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; - subobj["CONFIGDN_LDB"] = subobj["LDAPBACKEND"]; - subobj["CONFIGDN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; - subobj["SCHEMADN_LDB"] = subobj["LDAPBACKEND"]; - subobj["SCHEMADN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; + subobj.DOMAINDN_LDB = subobj.LDAPBACKEND; + subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; + subobj.CONFIGDN_LDB = subobj.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); } if (!provision_validate(subobj, message)) { diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index 9c1649ac3e..2fa0cc0ecc 100755 --- a/source4/setup/provision-backend +++ b/source4/setup/provision-backend @@ -88,7 +88,7 @@ for (r in options) { var paths = provision_default_paths(subobj); -provision_fix_subobj(subobj, message, paths); +provision_fix_subobj(subobj, paths); message("Provisioning LDAP backend for %s in realm %s into %s\n", subobj.HOSTNAME, subobj.REALM, subobj.LDAPDIR); message("Using LDAP Manager password: %s\n", subobj.LDAPMANAGERPASS); var tmp_schema_ldb = subobj.LDAPDIR + "/schema-tmp.ldb"; |