diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-12-11 02:09:37 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 06:00:00 +0100 |
| commit | 55bfefb02ba45e8fb38010b82eae21f316370862 (patch) | |
| tree | 59808a1a903d1e6ccaee4789803aea6d102a19ad | |
| parent | b8a40936071fae08f17a97506da6a5d23015bf41 (diff) | |
| download | samba-55bfefb02ba45e8fb38010b82eae21f316370862.tar.gz samba-55bfefb02ba45e8fb38010b82eae21f316370862.tar.bz2 samba-55bfefb02ba45e8fb38010b82eae21f316370862.zip | |
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)
| -rw-r--r-- | swat/install/provision.esp | 5 | ||||
| -rw-r--r-- | swat/install/vampire.esp | 3 |
2 files changed, 5 insertions, 3 deletions
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("<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 93971c1216..77e9959de3 100644 --- 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; |