r19318: Because we don't test the vampire code in SWAT very regularly, it bit-rotted.

[kai/samba.git] / swat / install / vampire.esp

diff --git a/swat/install/vampire.esp b/swat/install/vampire.esp
index 437cbda32ce2605b01ba8c8c10c07d05d6f442cf..9ce874cd186708cb50670fdb476006309cc09ad3 100644 (file)
--- 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;