sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

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

Browse Source 
Andrew Bartlett
(This used to be commit 45747c2041)
This commit is contained in:
Andrew Bartlett 2007-12-11 02:10:46 +01:00 committed by Stefan Metzmacher
parent 99930fe4e9
commit bb02fcda5a
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swat/install/index.esp
View 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")) {
%>

9
swat/install/provision.esp
View 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!");

4
swat/install/samba3.esp
View 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("/");

7
swat/install/vampire.esp
View 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;