svn commit: samba r19216 - in branches/SAMBA_4_0/source: scripting/libjs setup

[abartlet at samba.org]

Author: abartlet
Date: 2006-10-10 04:20:50 +0000 (Tue, 10 Oct 2006)
New Revision: 19216

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

Log:
Merge from SAMBA_4_0_RELEASE:

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

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-10-10 04:17:43 UTC (rev 19215)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-10-10 04:20:50 UTC (rev 19216)
@@ -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/source/setup/provision
===================================================================
--- branches/SAMBA_4_0/source/setup/provision	2006-10-10 04:17:43 UTC (rev 19215)
+++ branches/SAMBA_4_0/source/setup/provision	2006-10-10 04:20:50 UTC (rev 19216)
@@ -113,8 +113,6 @@
 
 if (options["ldap-backend"] != undefined) {
 	subobj["LDAPMODULES"] = "entryUUID,paged_searches";
-} else {
-	subobj["LDAPMODULES"] = "objectguid";
 }
 
 var blank = (options["blank"] != undefined);