sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-28 12:23:49 +03:00
Code Activity

r19318: Because we don't test the vampire code in SWAT very regularly, it bit-rotted.

Browse Source 
Fix up interfaces and interaction between the two..

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2006-10-16 03:53:12 +00:00
committed by Gerald (Jerry) Carter
parent 0ceffb52eb
commit 9b77d285d8
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/scripting/libjs/provision.js
View File

@@ -368,10 +368,12 @@ function provision_default_paths(subobj)
/* /*
setup reasonable name mappings for sam names to unix names setup reasonable name mappings for sam names to unix names
*/ */
function setup_name_mappings(info, subobj, ldb) function setup_name_mappings(info, ldb)
{ {
var lp = loadparm_init(); var lp = loadparm_init();
var attrs = new Array("objectSid"); var attrs = new Array("objectSid");
var subobj = info.subobj;
res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs); res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
assert(res.length == 1 && res[0].objectSid != undefined); assert(res.length == 1 && res[0].objectSid != undefined);
var sid = res[0].objectSid; var sid = res[0].objectSid;
@@ -525,7 +527,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
message("Setting up sam.ldb users and groups\n"); message("Setting up sam.ldb users and groups\n");
setup_add_ldif("provision_users.ldif", info, samdb, false); setup_add_ldif("provision_users.ldif", info, samdb, false);
if (setup_name_mappings(info, subobj, samdb) == false) { if (setup_name_mappings(info, samdb) == false) {
return false; return false;
} }

13
swat/install/vampire.esp
View File

@@ -58,18 +58,22 @@ if (form['submit'] == "Migrate") {
writefln("You need to set 'server role' to 'member server' before starting the migration process"); writefln("You need to set 'server role' to 'member server' before starting the migration process");
} else { } else {
var creds = credentials_init(); var creds = credentials_init();
var samdb;
creds.set_username(form.ADMIN); creds.set_username(form.ADMIN);
creds.set_password(form.ADMINPASS); creds.set_password(form.ADMINPASS);
creds.set_domain(form.DOMAIN); creds.set_domain(form.DOMAIN);
creds.set_realm(form.REALM); creds.set_realm(form.REALM);
var info = new Object(); var info = new Object();
info.message = writefln;
var paths = provision_default_paths(subobj); var paths = provision_default_paths(subobj);
var session_info = session.authinfo.session_info; var session_info = session.authinfo.session_info;
var credentials = session.authinfo.credentials; var credentials = session.authinfo.credentials;
info.credentials = credentials;
info.session_info = session_info;
info.message = writefln;
info.subobj = subobj;
/* Setup a basic database structure, but don't setup any users */ /* Setup a basic database structure, but don't setup any users */
if (!provision(subobj, writefln, true, paths, if (!provision(subobj, writefln, true, paths,
session_info, credentials)) { session_info, credentials)) {
@@ -86,7 +90,10 @@ if (form['submit'] == "Migrate") {
} else if (!provision_dns(subobj, writefln, paths, } else if (!provision_dns(subobj, writefln, paths,
session.authinfo.session_info, session.authinfo.credentials)) { session.authinfo.session_info, session.authinfo.credentials)) {
writefln("DNS Provision failed!"); writefln("DNS Provision failed!");
} else if (!setup_name_mappings(info, subobj, session_info, credentials)) { } else if (!(samdb = open_ldb(info, paths.samdb, false))) {
writefln("Opening " + paths.samdb + " failed!");
info.samdb = samdb;
} else if (!setup_name_mappings(info, samdb)) {
writefln("Setup of name mappings failed!"); writefln("Setup of name mappings failed!");
} else { } else {
var zonepath = paths.dns; var zonepath = paths.dns;