From 7135bb9e6372b5514dcbd27c64b140bb4025edec Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 10 Oct 2006 04:20:50 +0000 Subject: r19216: Merge from SAMBA_4_0_RELEASE: Move default for subobj.LDAPMODULES into scripting/libjs/provision.js so that SWAT can provision again. Andrew Bartlett (This used to be commit a4aafe307d6d1396fa79b0c48b0a36cbf682f0ce) --- source4/scripting/libjs/provision.js | 1 + source4/setup/provision | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index fdc86b1cf7..c20453a74d 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -625,6 +625,7 @@ function provision_guess() rdn_list = split(".", subobj.DNSDOMAIN); subobj.BASEDN = "DC=" + join(",DC=", rdn_list); subobj.LDAPBACKEND = "users.ldb"; + subobj.LDAPMODULES = "objectguid"; subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb"; return subobj; } diff --git a/source4/setup/provision b/source4/setup/provision index 619d029541..229deb1622 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -113,8 +113,6 @@ for (r in options) { if (options["ldap-backend"] != undefined) { subobj["LDAPMODULES"] = "entryUUID,paged_searches"; -} else { - subobj["LDAPMODULES"] = "objectguid"; } var blank = (options["blank"] != undefined); -- cgit