r20689: "pdc" and "bdc" have been replaced by "domain controller"

diff --git a/NEWS b/NEWS
index 44c84a46004f36c059d0b8e86f034e3dd4a66226..dd01091921066e3801e9998a148f312a1c166787 100644 (file)
--- 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 
 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:
 member server support does not work yet.
 
 The following parameters have been removed:

diff --git a/source/scripting/libjs/upgrade.js b/source/scripting/libjs/upgrade.js
index 9a5818c81f8c17dfbac9b3da19fcab32b91bc655..adb958a236d8be121c78edd297e41c6eadd8e810 100644 (file)
--- a/source/scripting/libjs/upgrade.js
+++ b/source/scripting/libjs/upgrade.js
@@ -497,13 +497,9 @@ function upgrade_smbconf(oldconf,mark)
        }
 
        if (oldconf.get("domain logons") == "True") {
        }
 
        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 {
        } else {

-               if (oldconf.get("domain master") == "True") {
+               if (oldconf.get("security") == "user") {

                        newconf.set("server role", "standalone");
                } else {
                        newconf.set("server role", "member server");
                        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 9ce874cd186708cb50670fdb476006309cc09ad3..611470e1f7b88e21c5feab985708f3234b77eb15 100644 (file)
--- 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();
                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();
                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
 
 <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>
 <li>Shutdown your existing PDC and any other DCs
 <li>Restart smbd
 </ul>