sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r26388: Fix up SWAT provision (again...), after changes I made to the

Browse Source 
command-line version a while back.

Andrew Bartlett
(This used to be commit 609184581d)
This commit is contained in:
Andrew Bartlett 2007-12-11 02:09:37 +01:00 committed by Stefan Metzmacher
parent b8a4093607
commit 55bfefb02b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swat/install/provision.esp
View File

@ -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 @@ 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!");

3
swat/install/vampire.esp
View File

@ -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;