svn commit: samba r9674 - in branches/SAMBA_4_0: . swat/install
tridge at samba.org
tridge at samba.org
Sat Aug 27 06:29:13 GMT 2005
Author: tridge
Date: 2005-08-27 06:29:12 +0000 (Sat, 27 Aug 2005)
New Revision: 9674
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9674
Log:
r9678 at blu: tridge | 2005-08-27 16:32:30 +1000
- removed the initial provision button. It is just way too confusing.
We should have a separate 'migration' page instead, but in the
meantime to migrate please use the command line
- added a check for a blank password. If blank, then ask them
to reenter it
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/swat/install/provision.esp
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: svk:merge
+ a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:9678
Modified: branches/SAMBA_4_0/swat/install/provision.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/provision.esp 2005-08-27 03:02:47 UTC (rev 9673)
+++ branches/SAMBA_4_0/swat/install/provision.esp 2005-08-27 06:29:12 UTC (rev 9674)
@@ -8,7 +8,7 @@
<h1>Samba4 provisioning</h1>
<%
-var f = FormObj("Provisioning", 0, 3);
+var f = FormObj("Provisioning", 0, 2);
var i;
var lp = loadparm_init();
@@ -31,15 +31,14 @@
f.add("BASEDN", "Base DN");
f.add("HOSTIP", "Host IP");
f.add("DEFAULTSITE", "Default Site");
-f.submit[0] = "Initial provision";
-f.submit[1] = "Provision";
-f.submit[2] = "Cancel";
+f.submit[0] = "Provision";
+f.submit[1] = "Cancel";
if (form['submit'] == "Cancel") {
redirect("/");
}
-if ((form['submit'] == "Provision") || (form['submit'] == "Initial provision")) {
+if (form['submit'] == "Provision") {
for (r in form) {
subobj[r] = form[r];
}
@@ -49,17 +48,20 @@
f.element[i].value = subobj[f.element[i].name];
}
-lp.set("realm", subobj.REALM);
+if (form['submit'] == "Provision") {
+ lp.set("realm", subobj.REALM);
+ var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
-var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
-if (form['submit'] == "Provision" && goodpass) {
- provision(subobj, writefln, true);
-} else if (form['submit'] == "Initial provision" && goodpass) {
- provision(subobj, writefln, false);
-} else {
- if (!goodpass && form['submit'] != undefined) {
+ if (!goodpass) {
write("<h3>Passwords don't match. Please try again.</h3>");
+ f.display();
+ } else if (subobj.ADMINPASS == "") {
+ write("<h3>You must choose an administrator password. Please try again.</h3>");
+ f.display();
+ } else {
+ provision(subobj, writefln, false);
}
+} else {
f.display();
}
%>
More information about the samba-cvs
mailing list