svn commit: samba r26389 - in branches/SAMBA_4_0/swat/install: .
abartlet at samba.org
abartlet at samba.org
Tue Dec 11 02:10:47 GMT 2007
Author: abartlet
Date: 2007-12-11 02:10:46 +0000 (Tue, 11 Dec 2007)
New Revision: 26389
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26389
Log:
Merge SWAT changes from alpha2 back into main Samba4 tree.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/swat/install/index.esp
branches/SAMBA_4_0/swat/install/provision.esp
branches/SAMBA_4_0/swat/install/samba3.esp
branches/SAMBA_4_0/swat/install/vampire.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/install/index.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/index.esp 2007-12-11 02:09:37 UTC (rev 26388)
+++ branches/SAMBA_4_0/swat/install/index.esp 2007-12-11 02:10:46 UTC (rev 26389)
@@ -1,7 +1,7 @@
<% page_header("columns", "Server Installation", "install");
-if (session.authinfo.user_class == "ADMINISTRATOR"
- || session.authinfo.user_class == "SYSTEM") {
+if ((session.authinfo.user_class == "ADMINISTRATOR")
+ || (session.authinfo.user_class == "SYSTEM")) {
%>
Modified: branches/SAMBA_4_0/swat/install/provision.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/provision.esp 2007-12-11 02:09:37 UTC (rev 26388)
+++ branches/SAMBA_4_0/swat/install/provision.esp 2007-12-11 02:10:46 UTC (rev 26389)
@@ -11,10 +11,9 @@
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 @@
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/swat/install/samba3.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/samba3.esp 2007-12-11 02:09:37 UTC (rev 26388)
+++ branches/SAMBA_4_0/swat/install/samba3.esp 2007-12-11 02:10:46 UTC (rev 26389)
@@ -15,8 +15,8 @@
<h1>Import from Samba3</h1>
<%
-if (session.authinfo.user_class == "ADMINISTRATOR"
- || session.authinfo.user_class == "SYSTEM") {
+if ((session.authinfo.user_class == "ADMINISTRATOR")
+ || (session.authinfo.user_class == "SYSTEM")) {
if (form['submit'] == "Cancel") {
redirect("/");
Modified: branches/SAMBA_4_0/swat/install/vampire.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/vampire.esp 2007-12-11 02:09:37 UTC (rev 26388)
+++ branches/SAMBA_4_0/swat/install/vampire.esp 2007-12-11 02:10:46 UTC (rev 26389)
@@ -14,8 +14,8 @@
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");
@@ -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