svn commit: samba r19317 - in branches/SAMBA_4_0_RELEASE: source/scripting/libjs swat/install

[abartlet at samba.org]

Author: abartlet
Date: 2006-10-16 03:49:07 +0000 (Mon, 16 Oct 2006)
New Revision: 19317

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

Log:
Because we don't test the vampire code from SWAT very regularly, it's
interaction with the provision scripts broke.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
   branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js	2006-10-16 03:42:43 UTC (rev 19316)
+++ branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js	2006-10-16 03:49:07 UTC (rev 19317)
@@ -368,10 +368,12 @@
 /*
   setup reasonable name mappings for sam names to unix names
 */
-function setup_name_mappings(info, subobj, ldb)
+function setup_name_mappings(info, ldb)
 {
 	var lp = loadparm_init();
 	var attrs = new Array("objectSid");
+	var subobj = info.subobj;
+
 	res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1 && res[0].objectSid != undefined);
 	var sid = res[0].objectSid;
@@ -525,7 +527,7 @@
 	message("Setting up sam.ldb users and groups\n");
 	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
-	if (setup_name_mappings(info, subobj, samdb) == false) {
+	if (setup_name_mappings(info, samdb) == false) {
 		return false;
 	}
 

Modified: branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp
===================================================================
--- branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp	2006-10-16 03:42:43 UTC (rev 19316)
+++ branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp	2006-10-16 03:49:07 UTC (rev 19317)
@@ -58,18 +58,22 @@
 		writefln("You need to set 'server role' to 'member server' before starting the migration process");
 	} else {
 		var creds = credentials_init();
+		var samdb;
 		creds.set_username(form.ADMIN);
 		creds.set_password(form.ADMINPASS);
 		creds.set_domain(form.DOMAIN);
 		creds.set_realm(form.REALM);
 
 		var info = new Object();
-		info.message = writefln;
-
 		var paths = provision_default_paths(subobj);
 		var session_info = session.authinfo.session_info;
 		var credentials = session.authinfo.credentials;
 
+		info.credentials = credentials;
+		info.session_info = session_info;
+		info.message = writefln;
+		info.subobj = subobj;
+
 		/* Setup a basic database structure, but don't setup any users */
 		if (!provision(subobj, writefln, true, paths,
 			       session_info, credentials)) {
@@ -86,7 +90,10 @@
 		} else if (!provision_dns(subobj, writefln, paths,
 					  session.authinfo.session_info, session.authinfo.credentials)) {
 			writefln("DNS Provision failed!");
-		} else if (!setup_name_mappings(info, subobj, session_info, credentials)) {
+		} else if (!(samdb = open_ldb(info, paths.samdb, false))) {
+			writefln("Opening " + paths.samdb + " failed!");
+			info.samdb = samdb;
+		} else if (!setup_name_mappings(info, samdb)) {
 			writefln("Setup of name mappings failed!");			
 		} else {
 			var zonepath = paths.dns;