r26389: Merge SWAT changes from alpha2 back into main Samba4 tree.

Andrew Bartlett
(This used to be commit 45747c2041e32063cda7a48c853fbb41d7de1eb0)

diff --git a/swat/install/index.esp b/swat/install/index.esp
index 73b7ea24d53147a1f6f2bf9c8837853e30ba2915..4ba581c1fd2a00c89f07fafb85aae9a315c7fc73 100644 (file)
--- a/swat/install/index.esp
+++ b/swat/install/index.esp
@@ -1,7 +1,7 @@
 <% page_header("columns", "Server Installation", "install"); 
 
 <% 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")) {

 
 %>
 
 
 %>
 

diff --git a/swat/install/provision.esp b/swat/install/provision.esp
index 6183722cb48fdb8db2e859f20aaef893acbb040c..c6511adb6675ddfc5246c37d9c4473d08761b10e 100644 (file)
--- a/swat/install/provision.esp
+++ b/swat/install/provision.esp
@@ -11,9 +11,8 @@
 var f = FormObj("Provisioning", 0, 2);
 var i;
 var lp = loadparm_init();
 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");
 
        if (lp.get("realm") == "") {
                lp.set("realm", lp.get("workgroup") + ".example.com");


@@ -56,6 +55,9 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
                lp.reload();
                var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
 
                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();
                if (!goodpass) {
                        write("<h3>Passwords don't match.  Please try again.</h3>");
                        f.display();


@@ -65,7 +67,6 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
                } else if (!provision_validate(subobj, writefln)) {
                        f.display();
                } else {
                } 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!");
                        if (!provision(subobj, writefln, false, paths, 
                                       session.authinfo.session_info, session.authinfo.credentials, false)) {
                                writefln("Provision failed!");

diff --git a/swat/install/samba3.esp b/swat/install/samba3.esp
index c6fc9f1418e1aebbe4d252933408d6e1a380cf45..4de942f972a2129c07de86ad388c20f2e2d6ac22 100644 (file)
--- a/swat/install/samba3.esp
+++ b/swat/install/samba3.esp
@@ -15,8 +15,8 @@
 <h1>Import from Samba3</h1>
 
 <%
 <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("/");
 
        if (form['submit'] == "Cancel") {
                redirect("/");

diff --git a/swat/install/vampire.esp b/swat/install/vampire.esp
index d5b7a73c538c6df24ba4cf223f0b68a8c3e0a1bc..77e9959de32f7ca87dc308969d562f1619b9eaec 100644 (file)
--- a/swat/install/vampire.esp
+++ b/swat/install/vampire.esp
@@ -14,8 +14,8 @@ var f = FormObj("Provisioning", 0, 2);
 var i;
 var lp = loadparm_init();
 
 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");
 
        if (lp.get("realm") == "") {
                lp.set("realm", lp.get("workgroup") + ".example.com");


@@ -76,7 +76,8 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
                        var session_info = session.authinfo.session_info;
                        var credentials = session.authinfo.credentials;
 
                        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;
                        info.session_info = session_info;
                        info.message = writefln;
                        info.subobj = subobj;