diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-26 18:15:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:59 -0500 |
| commit | bb9c9ec69c58c9707381e37a7d984e1fab32548f (patch) | |
| tree | 1347092c0a60a151e9fa24032ae98a4f322567e9 /source4 | |
| parent | 85abc86b214518b9b4d0728f3f0174bee0154c3c (diff) | |
| download | samba-bb9c9ec69c58c9707381e37a7d984e1fab32548f.tar.gz samba-bb9c9ec69c58c9707381e37a7d984e1fab32548f.tar.bz2 samba-bb9c9ec69c58c9707381e37a7d984e1fab32548f.zip | |
r10515: Handle replacement of "domain logons" and "domain master" by "server role"
(This used to be commit c5e3a1c55d9e21f9ee618169dc05c69ee9c9c5b1)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 16 |
1 files changed, 14 insertions, 2 deletions
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; } |