X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source4%2Fscripting%2Flibjs%2Fprovision.js;h=266bac1a75d70909b944587f7d751fa047d10e7d;hp=ef43ed721d46ec1ee8584c648bf4bb03d6e91af1;hb=48c2d871ea4864fcce47fc5e1fab926ce81de854;hpb=7c721a1f49d576e0a47c35e465206ade1c05d5a9

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ef43ed721d4..266bac1a75d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -162,6 +162,7 @@ function ldb_erase(info, ldb)
 	/* delete the specials */
 	ldb.del("@INDEXLIST");
 	ldb.del("@ATTRIBUTES");
+	ldb.del("@OPTIONS");
 	ldb.del("@MODULES");
 	ldb.del("@PARTITION");
 	ldb.del("@KLUDGEACL");
@@ -169,7 +170,7 @@ function ldb_erase(info, ldb)
 	/* and the rest */
 	attrs = new Array("dn");
      	var basedn = "";
-     	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+     	var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
 	if (res.error != 0) {
 		ldb_delete(info, ldb);
@@ -179,7 +180,7 @@ function ldb_erase(info, ldb)
 		ldb.del(res.msgs[i].dn);
 	}
 
-     	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+     	var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.error != 0 || res.msgs.length != 0) {
 		ldb_delete(info, ldb);
 		return;
@@ -197,14 +198,17 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 	var j;
 
 	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
-	assert(res.error == 0);
+	if (res.error != 0) {
+		info.message("rootdse search failed: " + res.errstr + "\n");
+		assert(res.error == 0);
+	}
 	assert(res.msgs.length == 1);
 	if (typeof(res.msgs[0].namingContexts) == "undefined") {
 		return;
 	}	
 	for (j=0; j<res.msgs[0].namingContexts.length; j++) {
-		var anything = "(|(objectclass=*)(dn=*))";
-		var attrs = new Array("dn");
+		var anything = "(|(objectclass=*)(distinguishedName=*))";
+		var attrs = new Array("distinguishedName");
 		var basedn = res.msgs[0].namingContexts[j];
 		var k;
 		var previous_remaining = 1;
@@ -220,8 +224,12 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			var i;
 			if (res2.error != 0) {
-				info.message("ldb search failed: " + res.errstr + "\n");
-				continue;
+				if (res2.error == 32) {
+					break;
+				} else {
+					info.message("ldb search(2) failed: " + res2.errstr + "\n");
+					continue;
+				}
 			}
 			previous_remaining = current_remaining;
 			current_remaining = res2.msgs.length;
@@ -231,7 +239,7 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			
 			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			if (res3.error != 0) {
-				info.message("ldb search failed: " + res.errstr + "\n");
+				info.message("ldb search(3) failed: " + res3.errstr + "\n");
 				continue;
 			}
 			if (res3.msgs.length != 0) {
@@ -378,10 +386,11 @@ function provision_default_paths(subobj)
 	var dnsdomain = strlower(subobj.REALM);
 	var lp = loadparm_init();
 	var paths = new Object();
-	paths.smbconf = lp.get("config file");
+	paths.smbconf = lp.filename()
 	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
+	paths.templates = lp.get("private dir") + "/" + "templates.ldb";
 	paths.keytab = "secrets.keytab";
 	paths.dns_keytab = "dns.keytab";
 	paths.dns_keytab_abs = lp.get("private dir") + "/" + paths.dns_keytab;
@@ -393,6 +402,9 @@ function provision_default_paths(subobj)
 	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
 	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
 
+	paths.s4_ldapi_socket = lp.get("private dir") + "/ldapi";
+	paths.phpldapadminconfig = lp.get("private dir") + "/phpldapadmin-config.php";
+
 	paths.sysvol = lp.get("sysvol", "path");
 
 	if (paths.sysvol == undefined) {
@@ -459,9 +471,7 @@ function provision_fix_subobj(subobj, paths)
 	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
 	subobj.DOMAIN      = strupper(subobj.DOMAIN);
-	assert(valid_netbios_name(subobj.DOMAIN));
 	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
-	assert(valid_netbios_name(subobj.NETBIOSNAME));
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
@@ -489,6 +499,9 @@ function provision_fix_subobj(subobj, paths)
 	var ldap_path_list = split("/", paths.ldapdir);
 	subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
 
+	var s4ldap_path_list = split("/", paths.s4_ldapi_socket);
+	subobj.S4_LDAPI_URI = "ldapi://" + join("%2F", s4ldap_path_list);
+
 	subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
 
 	subobj.NETLOGONPATH = paths.netlogon;
@@ -521,6 +534,9 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	info.message = message;
 	info.session_info = session_info;
 
+	message("Setting up templates into " + paths.templates + "\n");
+	setup_ldb("provision_templates.ldif", info, paths.templates);
+
 	/* Also wipes the database */
 	message("Setting up " + paths.samdb + " partitions\n");
 	setup_ldb("provision_partitions.ldif", info, paths.samdb);
@@ -541,9 +557,6 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	message("Setting up " + paths.samdb + " indexes\n");
 	setup_add_ldif("provision_index.ldif", info, samdb, false);
 
-	message("Setting up " + paths.samdb + " templates\n");
-	setup_add_ldif("provision_templates.ldif", info, samdb, false);
-
 	ok = samdb.transaction_commit();
 	assert(ok);
 
@@ -557,6 +570,44 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	return true;
 }
 
+function load_schema(subobj, message, samdb)
+{
+	var lp = loadparm_init();
+	var src = lp.get("setup directory") + "/" + "schema.ldif";
+
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
+	var schema_data = sys.file_load(src);
+
+	src = lp.get("setup directory") + "/" + "schema_samba4.ldif";
+
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
+	schema_data = schema_data + sys.file_load(src);
+
+	schema_data = substitute_var(schema_data, subobj);
+
+	src = lp.get("setup directory") + "/" + "provision_schema_basedn_modify.ldif";
+
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
+	var head_data = sys.file_load(src);
+	head_data = substitute_var(head_data, subobj);
+
+	var ok = samdb.attach_dsdb_schema_from_ldif(head_data, schema_data);
+	return ok;
+}
+
+
 /*
   provision samba4 - caution, this wipes all existing data!
 */
@@ -616,6 +667,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var reg = reg_open();
 	reg.apply_patchfile(lp.get("setup directory") + "/provision.reg")
 
+	message("Setting up templates into " + paths.templates + "\n");
+	setup_ldb("provision_templates.ldif", info, paths.templates);
+
 	message("Setting up sam.ldb partitions\n");
 	/* Also wipes the database */
 	setup_ldb("provision_partitions.ldif", info, paths.samdb);
@@ -631,43 +685,58 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, samdb, ldapbackend);
 	
+	// (hack) Reload, now we have the partitions and rootdse loaded.  
+	var commit_ok = samdb.transaction_commit();
+	if (!commit_ok) {
+		info.message("samdb commit failed: " + samdb.errstring() + "\n");
+		assert(commit_ok);
+	}
+	samdb.close();
+
+	message("Pre-loading the Samba4 and AD schema\n");
+	
+	samdb = open_ldb(info, paths.samdb, false);
+
+	samdb.set_domain_sid(subobj.DOMAINSID);
+
+	var load_schema_ok = load_schema(subobj, message, samdb);
+	assert(load_schema_ok.is_ok);
+
 	message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
 	message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
-	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
+	var modify_basedn_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
+	if (!modify_basedn_ok) {
 		if (!add_ok) {
 			message("%s", "Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
-		assert(modify_ok);
+		assert(modify_basedn_ok);
 	};
 
 	message("Adding configuration container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
+	var add_config_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
 	message("Modifying configuration container\n");
-	var modify_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_config_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
+	if (!modify_config_ok) {
+		if (!add_config_ok) {
 			message("%s", "Failed to both add and modify " + subobj.CONFIGDN + " in target " + subobj.CONFIGDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-			assert(modify_ok);
 		}
-		assert(modify_ok);
+		assert(modify_config_ok);
 	}
 
 	message("Adding schema container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
+	var add_schema_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
 	message("Modifying schema container\n");
-	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_schema_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
+	if (!modify_schema_ok) {
+		if (!add_schema_ok) {
 			message("%s", "Failed to both add and modify " + subobj.SCHEMADN + " in target " + subobj.SCHEMADN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-			assert(modify_ok);
 		}
 		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
-		assert(modify_ok);
+		assert(modify_schema_ok);
 	}
 
 	message("Setting up sam.ldb Samba4 schema\n");
@@ -675,45 +744,31 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up sam.ldb AD schema\n");
 	setup_add_ldif("schema.ldif", info, samdb, false);
 
-	// (hack) Reload, now we have the schema loaded.  
-	var commit_ok = samdb.transaction_commit();
-	if (!commit_ok) {
-		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-		assert(commit_ok);
-	}
-	samdb.close();
-
-	samdb = open_ldb(info, paths.samdb, false);
-
 	message("Setting up sam.ldb configuration data\n");
 	setup_add_ldif("provision_configuration.ldif", info, samdb, false);
 
 	message("Setting up display specifiers\n");
 	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
-	message("Setting up sam.ldb templates\n");
-	setup_add_ldif("provision_templates.ldif", info, samdb, false);
 
 	message("Adding users container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
+	var add_users_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
 	message("Modifying users container\n");
-	var modify_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_users_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
+	if (!modify_users_ok) {
+		if (!add_users_ok) {
 			message("Failed to both add and modify the users container\n");
-			assert(modify_ok);
 		}
-		assert(modify_ok);
+		assert(modify_users_ok);
 	}
 	message("Adding computers container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
+	var add_computers_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
 	message("Modifying computers container\n");
-	var modify_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_computers_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
+	if (!modify_computers_ok) {
+		if (!add_computers_ok) {
 			message("Failed to both add and modify the computers container\n");
-			assert(modify_ok);
 		}
-		assert(modify_ok);
+		assert(modify_computers_ok);
 	}
 
 	message("Setting up sam.ldb data\n");
@@ -784,6 +839,10 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		assert(commit_ok);
 	}
 
+	message("Setting up phpLDAPadmin configuration\n");
+	setup_file("phpldapadmin-config.php", info.message, paths.phpldapadminconfig, subobj);
+	message("Please install the phpLDAPadmin configuration located at " + paths.phpldapadminconfig + " into /etc/phpldapadmin/config.php\n");
+
 	return true;
 }
 
@@ -951,25 +1010,31 @@ function provision_guess()
 	//
 	// Some Known ordering constraints:
 	// - rootdse must be first, as it makes redirects from "" -> cn=rootdse
-	// - samldb must be before password_hash, because password_hash checks
-	//   that the objectclass is of type person (filled in by samldb)
+	// - objectclass must be before password_hash, because password_hash checks
+	//   that the objectclass is of type person (filled in by the objectclass 
+	//   module when expanding the objectclass list)
 	// - partition must be last
 	// - each partition has its own module list then
-	modules_list        = new Array("rootdse",
-					"kludge_acl",
-					"paged_results",
-					"server_sort",
-					"extended_dn",
-					"asq",
-					"samldb",
-					"operational",
-					"objectclass",
-					"rdn_name",
-					"subtree_rename",
-					"linked_attributes",
-					"show_deleted",
-					"partition");
+	var modules_list     = new Array("rootdse",
+					 "paged_results",
+					 "ranged_results",
+					 "anr",
+					 "server_sort",
+					 "extended_dn",
+					 "asq",
+					 "samldb",
+					 "rdn_name",
+					 "objectclass",
+					 "kludge_acl",
+					 "operational");
+	var tdb_modules_list = new Array("subtree_rename",
+					 "subtree_delete",
+					 "linked_attributes");
+	var modules_list2    = new Array("show_deleted",
+					 "partition");
 	subobj.MODULES_LIST = join(",", modules_list);
+	subobj.TDB_MODULES_LIST = "," + join(",", tdb_modules_list);
+	subobj.MODULES_LIST2 = join(",", modules_list2);
 	subobj.DOMAINDN_LDB = "users.ldb";
 	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN_LDB = "schema.ldb";
@@ -1062,7 +1127,6 @@ function newuser(username, unixname, password, message, session_info, credential
 	var ldif = sprintf("
 dn: %s
 sAMAccountName: %s
-memberOf: %s
 unixName: %s
 sambaPassword: %s
 objectClass: user