diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-06-05 05:35:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:53:11 -0500 |
| commit | 815cf409eb47de2f24b91a3eff31fc2d946d5d03 (patch) | |
| tree | 2043f1edf4e22c3396003b7d2216df69d850e70d /webapps/install | |
| parent | 57dd8aeee7b2724f286092112f38d7b4e608144a (diff) | |
| download | samba-815cf409eb47de2f24b91a3eff31fc2d946d5d03.tar.gz samba-815cf409eb47de2f24b91a3eff31fc2d946d5d03.tar.bz2 samba-815cf409eb47de2f24b91a3eff31fc2d946d5d03.zip | |
r23351: Merge from SAMBA_4_0_RELEASE:
Fix a nasty issue we had with SWAT. We could not provision into a
different domain, as we didn't re-calcuate the DOMAINDN after the user
changed it in the form.
Andrew Bartlett
(This used to be commit 430c998dc9ea41ea29cf184d03404b50ef14f78d)
Diffstat (limited to 'webapps/install')
| -rw-r--r-- | webapps/install/provision.esp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapps/install/provision.esp b/webapps/install/provision.esp index e4597af1c1..8caa7391b0 100644 --- a/webapps/install/provision.esp +++ b/webapps/install/provision.esp @@ -16,7 +16,6 @@ if (lp.get("realm") == "") { lp.set("realm", lp.get("workgroup") + ".example.com"); } - var subobj = provision_guess(); /* Don't supply default password for web interface */ subobj.ADMINPASS = ""; @@ -47,10 +46,11 @@ for (i=0;i<f.element.length;i++) { } if (form['submit'] == "Provision") { + /* overcome an initially blank smb.conf */ lp.set("realm", subobj.REALM); lp.set("workgroup", subobj.DOMAIN); - lp.reload() + lp.reload(); var goodpass = (subobj.CONFIRM == subobj.ADMINPASS); if (!goodpass) { |