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

[ira/wip.git] / source / scripting / libjs / upgrade.js

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");