svn commit: samba r26388 - in
branches/SAMBA_4_0_RELEASE/swat/install: .
abartlet at samba.org
abartlet at samba.org
Tue Dec 11 02:09:38 GMT 2007
Author: abartlet
Date: 2007-12-11 02:09:37 +0000 (Tue, 11 Dec 2007)
New Revision: 26388
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26388
Log:
Fix up SWAT provision (again...), after changes I made to the
command-line version a while back.
Andrew Bartlett
Modified:
branches/SAMBA_4_0_RELEASE/swat/install/provision.esp
branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp
Changeset:
Modified: branches/SAMBA_4_0_RELEASE/swat/install/provision.esp
===================================================================
--- branches/SAMBA_4_0_RELEASE/swat/install/provision.esp 2007-12-11 00:23:08 UTC (rev 26387)
+++ branches/SAMBA_4_0_RELEASE/swat/install/provision.esp 2007-12-11 02:09:37 UTC (rev 26388)
@@ -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 @@
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 @@
} 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!");
Modified: branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp
===================================================================
--- branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp 2007-12-11 00:23:08 UTC (rev 26387)
+++ branches/SAMBA_4_0_RELEASE/swat/install/vampire.esp 2007-12-11 02:09:37 UTC (rev 26388)
@@ -76,7 +76,8 @@
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;
More information about the samba-cvs
mailing list