summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2007-01-11 23:09:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:40:23 -0500
commitf1c81fdecd658031e8b95eb943839159434c0846 (patch)
treecf0ce1b81d68691a6b899be9d71fec75b9db990b /source4
parentaecbb307b57513e7a5cee1289fcc67cc4c6163a5 (diff)
downloadsamba-f1c81fdecd658031e8b95eb943839159434c0846.tar.gz
samba-f1c81fdecd658031e8b95eb943839159434c0846.tar.bz2
samba-f1c81fdecd658031e8b95eb943839159434c0846.zip
r20689: "pdc" and "bdc" have been replaced by "domain controller"
(This used to be commit 6976f283fc30a401bcc1d2c5089135c3fe8f1728)
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/libjs/upgrade.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 9a5818c81f..adb958a236 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -497,13 +497,9 @@ function upgrade_smbconf(oldconf,mark)
}
if (oldconf.get("domain logons") == "True") {
- if (oldconf.get("domain master") == "True") {
- newconf.set("server role", "pdc");
- } else {
- newconf.set("server role", "bdc");
- }
+ newconf.set("server role", "domain controller");
} else {
- if (oldconf.get("domain master") == "True") {
+ if (oldconf.get("security") == "user") {
newconf.set("server role", "standalone");
} else {
newconf.set("server role", "member server");