summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/scripting/libjs/upgrade.js16
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;
}