diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-01-24 01:52:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:25 -0500 |
| commit | f705108a8a14427f6ef114ad76d4f5e48759136e (patch) | |
| tree | 6d1fd29b87ed89933825d8475be18b3c8cf51187 /swat/install/vampire.esp | |
| parent | f2e760dd96acf1e1ceb572177e8a0eaf45c7cd1a (diff) | |
| download | samba-f705108a8a14427f6ef114ad76d4f5e48759136e.tar.gz samba-f705108a8a14427f6ef114ad76d4f5e48759136e.tar.bz2 samba-f705108a8a14427f6ef114ad76d4f5e48759136e.zip | |
r13102: fixed the vampire code to correctly setup foreign sids and default
unix name mappings
(This used to be commit dc74d8ccf15b9324cd8b90ef9d41cf293b9de8e3)
Diffstat (limited to 'swat/install/vampire.esp')
| -rw-r--r-- | swat/install/vampire.esp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/swat/install/vampire.esp b/swat/install/vampire.esp index db317e2635..437cbda32c 100644 --- a/swat/install/vampire.esp +++ b/swat/install/vampire.esp @@ -54,6 +54,8 @@ if (form['submit'] == "Migrate") { f.display(); } else if (!provision_validate(subobj, writefln)) { f.display(); + } else if (strupper(lp.get("server role")) == "PDC") { + writefln("You need to set 'server role' to 'member server' before starting the migration process"); } else { var creds = credentials_init(); creds.set_username(form.ADMIN); @@ -61,11 +63,16 @@ if (form['submit'] == "Migrate") { creds.set_domain(form.DOMAIN); creds.set_realm(form.REALM); + var info = new Object(); + info.message = writefln; + var paths = provision_default_paths(subobj); + var session_info = session.authinfo.session_info; + var credentials = session.authinfo.credentials; /* Setup a basic database structure, but don't setup any users */ if (!provision(subobj, writefln, true, paths, - session.authinfo.session_info, session.authinfo.credentials)) { + session_info, credentials)) { writefln("Provision failed!"); /* Join domain */ @@ -79,6 +86,8 @@ if (form['submit'] == "Migrate") { } else if (!provision_dns(subobj, writefln, paths, session.authinfo.session_info, session.authinfo.credentials)) { writefln("DNS Provision failed!"); + } else if (!setup_name_mappings(info, subobj, session_info, credentials)) { + writefln("Setup of name mappings failed!"); } else { var zonepath = paths.dns; %> |