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)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index fdc86b1cf74bdd7e70011c3c10247cfff31a94a7..c20453a74d1570727397258c5a0d6d34a9171fd4 100644 (file)
--- 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 619d029541e0e5f505e2c82a8bc91ede9a469b9c..229deb1622221c3a510c8aa8589fd5030a2ecccb 100755 (executable)
--- 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);