From bb9c9ec69c58c9707381e37a7d984e1fab32548f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 26 Sep 2005 18:15:24 +0000 Subject: r10515: Handle replacement of "domain logons" and "domain master" by "server role" (This used to be commit c5e3a1c55d9e21f9ee618169dc05c69ee9c9c5b1) --- source4/scripting/libjs/upgrade.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js index 62556ed8d9..6109371338 100644 --- a/source4/scripting/libjs/upgrade.js +++ b/source4/scripting/libjs/upgrade.js @@ -387,11 +387,9 @@ smbconf_keep = new Array( "map system", "map hidden", "map archive", - "domain logons", "preferred master", "prefered master", "local master", - "domain master", "browseable", "browsable", "wins server", @@ -444,6 +442,20 @@ function upgrade_smbconf(oldconf,mark) } } + if (oldconf.get("domain logons") == "True") { + if (oldconf.get("domain master") == "True") { + newconf.set("role", "pdc"); + } else { + newconf.set("role", "bdc"); + } + } else { + if (oldconf.get("domain master") == "True") { + newconf.set("role", "standalone"); + } else { + newconf.set("role", "member server"); + } + } + return newconf; } -- cgit