svn commit: samba r19214 - in branches/SAMBA_4_0_RELEASE/source: scripting/libjs setup

[abartlet]

Author: abartlet
Date: 2006-10-10 04:16:53 +0000 (Tue, 10 Oct 2006)
New Revision: 19214

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19214

Log:
Move default for subobj.LDAPMODULES into scripting/libjs/provision.js
so that SWAT can provision again.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
   branches/SAMBA_4_0_RELEASE/source/setup/provision


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js      
2006-10-10 04:12:30 UTC (rev 19213)
+++ branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js      
2006-10-10 04:16:53 UTC (rev 19214)
@@ -625,6 +625,7 @@
        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;
 }

Modified: branches/SAMBA_4_0_RELEASE/source/setup/provision
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/setup/provision   2006-10-10 04:12:30 UTC 
(rev 19213)
+++ branches/SAMBA_4_0_RELEASE/source/setup/provision   2006-10-10 04:16:53 UTC 
(rev 19214)
@@ -113,8 +113,6 @@
 
 if (options["ldap-backend"] != undefined) {
        subobj["LDAPMODULES"] = "entryUUID,paged_searches";
-} else {
-       subobj["LDAPMODULES"] = "objectguid";
 }
 
 var blank = (options["blank"] != undefined);