summaryrefslogtreecommitdiff
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
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)
-rw-r--r--NEWS2
-rw-r--r--source4/scripting/libjs/upgrade.js8
-rw-r--r--webapps/install/vampire.esp4
3 files changed, 5 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 44c84a4600..dd01091921 100644
--- a/NEWS
+++ b/NEWS
@@ -55,7 +55,7 @@ The 'security' parameter has been split up. It is now only used to choose
between the 'user' and 'share' security levels (the latter is not supported
in Samba 4 yet). The other values of this option and the 'domain master' and
'domain logons' parameters have been merged into a 'server role' parameter
-that can be either 'bdc', 'pdc', 'member server' or 'standalone'. Note that
+that can be either 'domain controller', 'member server' or 'standalone'. Note that
member server support does not work yet.
The following parameters have been removed:
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");
diff --git a/webapps/install/vampire.esp b/webapps/install/vampire.esp
index 9ce874cd18..611470e1f7 100644
--- a/webapps/install/vampire.esp
+++ b/webapps/install/vampire.esp
@@ -54,7 +54,7 @@ if (form['submit'] == "Migrate") {
f.display();
} else if (!provision_validate(subobj, writefln)) {
f.display();
- } else if (strupper(lp.get("server role")) == "PDC") {
+ } else if (strupper(lp.get("server role")) == "domain controller") {
writefln("You need to set 'server role' to 'member server' before starting the migration process");
} else {
var creds = credentials_init();
@@ -104,7 +104,7 @@ You need to do the following to complete the process:
<ul>
<li>Install the <b>@@zonepath</b> zone file into your bind install, and restart bind
-<li>Change your smb.conf to set "server role = pdc"
+<li>Change your smb.conf to set "server role = domain controller"
<li>Shutdown your existing PDC and any other DCs
<li>Restart smbd
</ul>