r12928: This patch improves the interaction between the vampire and provsion code.

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

diff --git a/swat/install/vampire.esp b/swat/install/vampire.esp
index bd96f919621585ddefd40042aceab3f2f29d06f0..19f99dce98d0bbc8ba2b470b80f209a5e0335fb8 100644 (file)
--- a/swat/install/vampire.esp
+++ b/swat/install/vampire.esp
@@ -23,13 +23,12 @@ var subobj = provision_guess();
 /* Don't supply default password for web interface */
 subobj.ADMINPASS = "";
 
 /* Don't supply default password for web interface */
 subobj.ADMINPASS = "";
 

-f.add("REALM", "Realm");
-f.add("DOMAIN", "Domain Name");
+f.add("REALM", "DNS Domain Name");
+f.add("DOMAIN", "NetBIOS Domain Name");

 f.add("ADMIN", "Administrator Username");
 f.add("ADMINPASS", "Administrator Password", "password");
 f.add("HOSTNAME", "My Hostname");
 f.add("ADMIN", "Administrator Username");
 f.add("ADMINPASS", "Administrator Password", "password");
 f.add("HOSTNAME", "My Hostname");

-f.add("HOSTGUID", "Host GUID");
-f.add("HOSTIP", "Host IP");
+f.add("HOSTIP", "My Host's IP");

 f.add("DEFAULTSITE", "Default Site");
 f.submit[0] = "Migrate";
 f.submit[1] = "Cancel";
 f.add("DEFAULTSITE", "Default Site");
 f.submit[0] = "Migrate";
 f.submit[1] = "Cancel";


@@ -62,24 +61,26 @@ if (form['submit'] == "Migrate") {
                creds.set_domain(form.DOMAIN);
                creds.set_realm(form.REALM);
 
                creds.set_domain(form.DOMAIN);
                creds.set_realm(form.REALM);
 

+               var paths = provision_default_paths(subobj);
+

                /* Setup a basic database structure, but don't setup any users */
                /* Setup a basic database structure, but don't setup any users */

-               if (!provision(subobj, writefln, true, provision_default_paths(subobj),
-                             session.authinfo.session_info, session.authinfo.credentials)) {
+               if (!provision(subobj, writefln, true, paths,
+                              session.authinfo.session_info, session.authinfo.credentials)) {

                        writefln("Provision failed!");
 
                /* Join domain */
                } else if (!join_domain(form.DOMAIN, form.HOSTNAME, misc.SEC_CHAN_BDC, creds, writefln)) {
                        writefln("Domain Join failed!");
                        
                        writefln("Provision failed!");
 
                /* Join domain */
                } else if (!join_domain(form.DOMAIN, form.HOSTNAME, misc.SEC_CHAN_BDC, creds, writefln)) {
                        writefln("Domain Join failed!");
                        

+                /* Vampire */
+               } else if (!vampire(form.DOMAIN, session.authinfo.session_info, 
+                                           session.authinfo.credentials, writefln)) {
+                       writefln("Failed to syncronsise remote domain into local database!");
+               } else if (!provision_dns(subobj, writefln, paths,
+                                         session.authinfo.session_info, session.authinfo.credentials)) {
+                       writefln("DNS Provision failed!");

                } else {
                } else {

-                       /* Vampire */
-                       var machine_creds = credentials_init();
-                       machine_creds.set_domain(form.DOMAIN);
-                       if (!machine_creds.set_machine_account()) {
-                               writefln("Failed to access newly setup domain join!");
-                       } else if (!vampire(machine_creds, writefln)) {
-                               writefln("Failed to syncronsise remote domain into local database!");
-                       }
+                       writefln("Migration Complete!");

                }
        }
 } else {
                }
        }
 } else {