Author: idra Date: 2007-01-11 23:09:57 +0000 (Thu, 11 Jan 2007) New Revision: 20689
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20689 Log: "pdc" and "bdc" have been replaced by "domain controller" Modified: branches/SAMBA_4_0/NEWS branches/SAMBA_4_0/source/scripting/libjs/upgrade.js branches/SAMBA_4_0/webapps/install/vampire.esp Changeset: Modified: branches/SAMBA_4_0/NEWS =================================================================== --- branches/SAMBA_4_0/NEWS 2007-01-11 22:47:29 UTC (rev 20688) +++ branches/SAMBA_4_0/NEWS 2007-01-11 23:09:57 UTC (rev 20689) @@ -55,7 +55,7 @@ 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: Modified: branches/SAMBA_4_0/source/scripting/libjs/upgrade.js =================================================================== --- branches/SAMBA_4_0/source/scripting/libjs/upgrade.js 2007-01-11 22:47:29 UTC (rev 20688) +++ branches/SAMBA_4_0/source/scripting/libjs/upgrade.js 2007-01-11 23:09:57 UTC (rev 20689) @@ -497,13 +497,9 @@ } 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"); Modified: branches/SAMBA_4_0/webapps/install/vampire.esp =================================================================== --- branches/SAMBA_4_0/webapps/install/vampire.esp 2007-01-11 22:47:29 UTC (rev 20688) +++ branches/SAMBA_4_0/webapps/install/vampire.esp 2007-01-11 23:09:57 UTC (rev 20689) @@ -54,7 +54,7 @@ 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 @@ <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>