From 8afbf3a0ef63dfc5553e7de8dc498685d8fd2bc7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 Oct 2006 03:53:12 +0000 Subject: r19318: Because we don't test the vampire code in SWAT very regularly, it bit-rotted. Fix up interfaces and interaction between the two.. Andrew Bartlett (This used to be commit 9b77d285d8cd8999547c0d17e97681d236acbdb0) --- swat/install/vampire.esp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'swat') diff --git a/swat/install/vampire.esp b/swat/install/vampire.esp index 437cbda32c..9ce874cd18 100644 --- a/swat/install/vampire.esp +++ b/swat/install/vampire.esp @@ -58,18 +58,22 @@ if (form['submit'] == "Migrate") { 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 @@ if (form['submit'] == "Migrate") { } 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; -- cgit