svn commit: samba r9831 - in branches/SAMBA_4_0/swat/install: .
jelmer at samba.org
jelmer at samba.org
Wed Aug 31 15:47:11 GMT 2005
Author: jelmer
Date: 2005-08-31 15:47:10 +0000 (Wed, 31 Aug 2005)
New Revision: 9831
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9831
Log:
Check whether the two admin passwords entered were equal.
Modified:
branches/SAMBA_4_0/swat/install/samba3.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/install/samba3.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/samba3.esp 2005-08-31 15:46:41 UTC (rev 9830)
+++ branches/SAMBA_4_0/swat/install/samba3.esp 2005-08-31 15:47:10 UTC (rev 9831)
@@ -19,11 +19,13 @@
redirect("/");
}
-if (form['submit'] == "Import") {
+function confirm_form()
+{
var samba3 = samba3_read(form['LIBDIR'], form['SMBCONF']);
var subobj = upgrade_provision(samba3);
var f = FormObj("Import from Samba3", 0, 2);
+ subobj.ADMINPASS = "";
f.add("REALM", "Realm");
f.add("DOMAIN", "Domain Name");
@@ -46,6 +48,10 @@
f.submit[0] = "Continue";
f.submit[1] = "Cancel";
f.display();
+}
+
+if (form['submit'] == "Import") {
+ confirm_form();
} else if (form['submit'] == "Continue") {
var samba3 = samba3_read(form['LIBDIR'], form['SMBCONF']);
assert(samba3 != undefined);
@@ -53,14 +59,25 @@
for (r in form) {
subobj[r] = form[r];
}
- var paths = provision_default_paths(subobj);
- provision(subobj, writefln, true, paths);
- upgrade(subobj, samba3, writefln, paths);
+ var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
- writefln("Reloading smb.conf\n");
- var lp = loadparm_init();
- lp.reload();
+ if (!goodpass) {
+ write("<h3>Passwords don't match. Please try again.</h3>");
+ confirm_form();
+ } else if (subobj.ADMINPASS == "") {
+ write("<h3>You must choose an administrator password. Please try again.</h3>");
+ confirm_form();
+ } else {
+ var paths = provision_default_paths(subobj);
+
+ provision(subobj, writefln, true, paths);
+ upgrade(subobj, samba3, writefln, paths);
+
+ writefln("Reloading smb.conf\n");
+ var lp = loadparm_init();
+ lp.reload();
+ }
} else {
var f = FormObj("Import from Samba3", 0, 2);
More information about the samba-cvs
mailing list