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

[abartlet at samba.org]

Author: abartlet
Date: 2006-10-14 21:40:06 +0000 (Sat, 14 Oct 2006)
New Revision: 19283

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

Log:
Merge changes for a faster provision (by tridge and myself) from
SAMBA_4_0.

Andrew Bartlett

Added:
   branches/SAMBA_4_0_RELEASE/source/setup/provision_index.ldif
Modified:
   branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
   branches/SAMBA_4_0_RELEASE/source/setup/provision_init.ldif


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js	2006-10-14 21:02:38 UTC (rev 19282)
+++ branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js	2006-10-14 21:40:06 UTC (rev 19283)
@@ -157,7 +157,7 @@
 */
 function ldb_erase(ldb)
 {
-	var attrs = new Array("dn");
+	var res;
 
 	/* delete the specials */
 	ldb.del("@INDEXLIST");
@@ -168,6 +168,7 @@
 	ldb.del("@KLUDGEACL");
 
 	/* and the rest */
+	attrs = new Array("dn");
      	var basedn = "";
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
@@ -179,6 +180,7 @@
 		ldb.del(res[i].dn);
 	}
 
+
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
@@ -292,7 +294,7 @@
 	        failok = arguments[4];
         }
 	var ldb = open_ldb(info, dbname, erase);
-	if (setup_add_ldif(ldif, info, ldb, erase, failok)) {
+	if (setup_add_ldif(ldif, info, ldb, failok)) {
 		var commit_ok = ldb.transaction_commit();
 		if (!commit_ok) {
 			info.message("ldb commit failed: " + ldb.errstring() + "\n");
@@ -509,6 +511,9 @@
 	setup_add_ldif("provision.ldif", info, samdb, false);
 
 	if (blank != false) {
+		message("Setting up sam.ldb index\n");
+		setup_add_ldif("provision_index.ldif", info, samdb, false);
+
 		var commit_ok = samdb.transaction_commit();
 		if (!commit_ok) {
 			info.message("ldb commit failed: " + samdb.errstring() + "\n");
@@ -524,6 +529,9 @@
 		return false;
 	}
 
+	message("Setting up sam.ldb index\n");
+	setup_add_ldif("provision_index.ldif", info, samdb, false);
+
 	var commit_ok = samdb.transaction_commit();
 	if (!commit_ok) {
 		info.message("samdb commit failed: " + samdb.errstring() + "\n");

Added: branches/SAMBA_4_0_RELEASE/source/setup/provision_index.ldif
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/setup/provision_index.ldif	2006-10-14 21:02:38 UTC (rev 19282)
+++ branches/SAMBA_4_0_RELEASE/source/setup/provision_index.ldif	2006-10-14 21:40:06 UTC (rev 19283)
@@ -0,0 +1,16 @@
+dn: @INDEXLIST
+ at IDXATTR: name
+ at IDXATTR: sAMAccountName
+ at IDXATTR: objectSid
+ at IDXATTR: objectCategory
+ at IDXATTR: member
+ at IDXATTR: uidNumber
+ at IDXATTR: gidNumber
+ at IDXATTR: unixName
+ at IDXATTR: privilege
+ at IDXATTR: nCName
+ at IDXATTR: lDAPDisplayName
+ at IDXATTR: subClassOf
+ at IDXATTR: dnsRoot
+ at IDXATTR: nETBIOSName
+

Modified: branches/SAMBA_4_0_RELEASE/source/setup/provision_init.ldif
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/setup/provision_init.ldif	2006-10-14 21:02:38 UTC (rev 19282)
+++ branches/SAMBA_4_0_RELEASE/source/setup/provision_init.ldif	2006-10-14 21:40:06 UTC (rev 19283)
@@ -1,20 +1,3 @@
-dn: @INDEXLIST
- at IDXATTR: name
- at IDXATTR: sAMAccountName
- at IDXATTR: objectSid
- at IDXATTR: objectClass
- at IDXATTR: objectCategory
- at IDXATTR: member
- at IDXATTR: uidNumber
- at IDXATTR: gidNumber
- at IDXATTR: unixName
- at IDXATTR: privilege
- at IDXATTR: nCName
- at IDXATTR: lDAPDisplayName
- at IDXATTR: subClassOf
- at IDXATTR: dnsRoot
- at IDXATTR: nETBIOSName
-
 dn: @ATTRIBUTES
 userPrincipalName: CASE_INSENSITIVE
 servicePrincipalName: CASE_INSENSITIVE