r26388: Fix up SWAT provision (again...), after changes I made to the

command-line version a while back.

Andrew Bartlett
(This used to be commit 609184581d9f02420b44a46384c34bea2cf62906)

diff --git a/swat/install/provision.esp b/swat/install/provision.esp
index 0b0a83fba6b0eeea577ff360256e0a4daf9138de..c6511adb6675ddfc5246c37d9c4473d08761b10e 100644 (file)
--- a/swat/install/provision.esp
+++ b/swat/install/provision.esp
@@ -11,7 +11,6 @@
 var f = FormObj("Provisioning", 0, 2);
 var i;
 var lp = loadparm_init();
-
 if ((session.authinfo.user_class == "ADMINISTRATOR")
         || (session.authinfo.user_class == "SYSTEM")) {
 
@@ -56,6 +55,9 @@ if ((session.authinfo.user_class == "ADMINISTRATOR")
                lp.reload();
                var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
 
+               var paths = provision_default_paths(subobj);
+               provision_fix_subobj(subobj, paths);
+
                if (!goodpass) {
                        write("<h3>Passwords don't match.  Please try again.</h3>");
                        f.display();
@@ -65,7 +67,6 @@ if ((session.authinfo.user_class == "ADMINISTRATOR")
                } else if (!provision_validate(subobj, writefln)) {
                        f.display();
                } else {
-                       var paths = provision_default_paths(subobj);
                        if (!provision(subobj, writefln, false, paths, 
                                       session.authinfo.session_info, session.authinfo.credentials, false)) {
                                writefln("Provision failed!");

diff --git a/swat/install/vampire.esp b/swat/install/vampire.esp
index 93971c12165baf33a6232c2b54d58f351cc002f9..77e9959de32f7ca87dc308969d562f1619b9eaec 100644 (file)
--- a/swat/install/vampire.esp
+++ b/swat/install/vampire.esp
@@ -76,7 +76,8 @@ if ((session.authinfo.user_class == "ADMINISTRATOR")
                        var session_info = session.authinfo.session_info;
                        var credentials = session.authinfo.credentials;
 
-                       info.credentials = credentials;
+                       provision_fix_subobj(subobj, paths);
+               
                        info.session_info = session_info;
                        info.message = writefln;
                        info.subobj = subobj;