From 55bfefb02ba45e8fb38010b82eae21f316370862 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 11 Dec 2007 02:09:37 +0100 Subject: 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) --- swat/install/provision.esp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'swat/install/provision.esp') diff --git a/swat/install/provision.esp b/swat/install/provision.esp index 0b0a83fba6..c6511adb66 100644 --- 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("

Passwords don't match. Please try again.

"); 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!"); -- cgit