diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-05 20:10:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:36:57 -0500 |
| commit | 8a2636af4ac675ca427d5e1999672141a560e3c2 (patch) | |
| tree | 144865d57ebd92fa4e810ba6fd135f3620b5b86a /source4/scripting/libjs | |
| parent | 102e4840b3bc11cc84a0ecb784190e7501277ac4 (diff) | |
| download | samba-8a2636af4ac675ca427d5e1999672141a560e3c2.tar.gz samba-8a2636af4ac675ca427d5e1999672141a560e3c2.tar.bz2 samba-8a2636af4ac675ca427d5e1999672141a560e3c2.zip | |
r20560: make it possible to configure the backend and modules
for all partitions and make it not use LDAP in the variable names
because it isn't specific to the ldap backend case.
metze
(This used to be commit 3e337ec2764038e4ff05c3e926220abaa5583702)
Diffstat (limited to 'source4/scripting/libjs')
| -rw-r--r-- | source4/scripting/libjs/provision.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 39810e1f94..461550d5b5 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -508,7 +508,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb); if (!modify_ok) { if (!add_ok) { - message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.LDAPBACKEND + "\n"); + message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + "\n"); message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); }; assert(modify_ok); @@ -691,20 +691,25 @@ function provision_guess() subobj.WHEEL = findnss(nss.getgrnam, "wheel", "root", "staff", "adm"); subobj.BACKUP = findnss(nss.getgrnam, "backup", "wheel", "root", "staff"); subobj.USERS = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr"); + subobj.DNSDOMAIN = strlower(subobj.REALM); subobj.DNSNAME = sprintf("%s.%s", strlower(subobj.HOSTNAME), subobj.DNSDOMAIN); rdn_list = split(".", subobj.DNSDOMAIN); - subobj.DOMAINDN = "DC=" + join(",DC=", rdn_list); + subobj.DOMAINDN = "DC=" + join(",DC=", rdn_list); + subobj.DOMAINDN_LDB = "users.ldb"; + subobj.DOMAINDN_MOD = "objectguid"; subobj.ROOTDN = subobj.DOMAINDN; subobj.CONFIGDN = "CN=Configuration," + subobj.ROOTDN; + subobj.CONFIGDN_LDB = "configuration.ldb"; + subobj.CONFIGDN_MOD = "objectguid"; subobj.SCHEMADN = "CN=Schema," + subobj.CONFIGDN; - subobj.LDAPBACKEND = "users.ldb"; - subobj.LDAPMODULE = "entryUUID"; - subobj.LDAPMODULES = "objectguid"; + subobj.SCHEMADN_LDB = "schema.ldb"; + subobj.SCHEMADN_MOD = "objectguid"; + subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb"; - subobj.ACI = "# no aci for local ldb"; + subobj.ACI = "# no aci for local ldb"; return subobj; } |