Author: tridge Date: 2007-10-18 03:14:10 +0000 (Thu, 18 Oct 2007) New Revision: 25691
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25691 Log: make "server role" case insensitive Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js =================================================================== --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-10-18 02:03:21 UTC (rev 25690) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-10-18 03:14:10 UTC (rev 25691) @@ -500,7 +500,7 @@ if (subobj.REALM_CONF == undefined) { subobj.REALM_CONF = subobj.REALM; } - if (subobj.SERVERROLE != "domain controller") { + if (strlower(subobj.SERVERROLE) != strlower("domain controller")) { subobj.REALM = subobj.HOSTNAME; subobj.DOMAIN = subobj.HOSTNAME; } @@ -590,9 +590,9 @@ var st = sys.stat(paths.smbconf); if (st == undefined) { var smbconfsuffix; - if (subobj.SERVERROLE == "domain controller") { + if (strlower(subobj.SERVERROLE) == strlower("domain controller")) { smbconfsuffix = "dc"; - } else if (subobj.SERVERROLE == "member server") { + } else if (strlower(subobj.SERVERROLE) == strlower("member server")) { smbconfsuffix = "member"; } else { smbconfsuffix = subobj.SERVERROLE; @@ -750,7 +750,7 @@ message("Setting up sam.ldb users and groups\n"); setup_add_ldif("provision_users.ldif", info, samdb, false); - if (subobj.SERVERROLE == "domain controller") { + if (strlower(subobj.SERVERROLE) == strlower("domain controller")) { message("Setting up self join\n"); setup_add_ldif("provision_self_join.ldif", info, samdb, false); setup_add_ldif("provision_group_policy.ldif", info, samdb, false); @@ -838,7 +838,7 @@ function provision_dns(subobj, message, paths, session_info, credentials) { var lp = loadparm_init(); - if (subobj.SERVERROLE != "domain controller") { + if (strlower(subobj.SERVERROLE) != strlower("domain controller")) { message("No DNS zone required for role %s\n", subobj.SERVERROLE); return; } @@ -971,7 +971,7 @@ subobj.DOMAINDN_LDB = "users.ldb"; subobj.CONFIGDN_LDB = "configuration.ldb"; subobj.SCHEMADN_LDB = "schema.ldb"; - subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash"; + subobj.DOMAINDN_MOD = "subtree_rename,pdc_fsmo,password_hash"; subobj.CONFIGDN_MOD = "naming_fsmo"; subobj.SCHEMADN_MOD = "schema_fsmo"; subobj.DOMAINDN_MOD2 = ",objectguid"; @@ -1142,7 +1142,7 @@ return false; } - if (strupper(lp.get("server role")) != strupper(subobj.SERVERROLE)) { + if (strlower(lp.get("server role")) != strlower(subobj.SERVERROLE)) { message("server role '%s' in smb.conf must match chosen role '%s'\n", lp.get("server role"), subobj.SERVERROLE); return false;
