diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-12-11 02:10:46 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:20 +0100 |
| commit | bb02fcda5a8704351afcc93171202f8ad342e05e (patch) | |
| tree | 123d006c5ce9076de69439a65f90782c82823301 /swat/install/provision.esp | |
| parent | 99930fe4e9c4665b06a41f4acc4c9127a2214681 (diff) | |
| download | samba-bb02fcda5a8704351afcc93171202f8ad342e05e.tar.gz samba-bb02fcda5a8704351afcc93171202f8ad342e05e.tar.bz2 samba-bb02fcda5a8704351afcc93171202f8ad342e05e.zip | |
r26389: Merge SWAT changes from alpha2 back into main Samba4 tree.
Andrew Bartlett
(This used to be commit 45747c2041e32063cda7a48c853fbb41d7de1eb0)
Diffstat (limited to 'swat/install/provision.esp')
| -rw-r--r-- | swat/install/provision.esp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/swat/install/provision.esp b/swat/install/provision.esp index 6183722cb4..c6511adb66 100644 --- a/swat/install/provision.esp +++ b/swat/install/provision.esp @@ -11,9 +11,8 @@ var f = FormObj("Provisioning", 0, 2); var i; var lp = loadparm_init(); - -if (session.authinfo.user_class == "ADMINISTRATOR" - || session.authinfo.user_class == "SYSTEM") { +if ((session.authinfo.user_class == "ADMINISTRATOR") + || (session.authinfo.user_class == "SYSTEM")) { if (lp.get("realm") == "") { lp.set("realm", lp.get("workgroup") + ".example.com"); @@ -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!"); |