r26389: Merge SWAT changes from alpha2 back into main Samba4 tree.
authorAndrew Bartlett <abartlet@samba.org>
Tue, 11 Dec 2007 01:10:46 +0000 (02:10 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 04:49:20 +0000 (05:49 +0100)
Andrew Bartlett
(This used to be commit 45747c2041e32063cda7a48c853fbb41d7de1eb0)

swat/install/index.esp
swat/install/provision.esp
swat/install/samba3.esp
swat/install/vampire.esp

index 73b7ea2..4ba581c 100644 (file)
@@ -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")) {
 
 %>
 
index 6183722..c6511ad 100644 (file)
@@ -11,9 +11,8 @@
 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 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
                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 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
                } 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!");
index c6fc9f1..4de942f 100644 (file)
@@ -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("/");
index d5b7a73..77e9959 100644 (file)
@@ -14,8 +14,8 @@ 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");
@@ -76,7 +76,8 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
                        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;