From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 18 Oct 2007 01:14:10 +0000 (+0200)
Subject: r25691: make "server role" case insensitive
X-Git-Tag: samba-4.0.0alpha6~801^3~1659
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=62078f17bad197780c8cc4e501dd1655bd809edc;hp=0906096ee4fbca6338863319edb68cfe338fd6a3;p=nivanova%2Fsamba-autobuild%2F.git

r25691: make "server role" case insensitive
(This used to be commit f61a9b706894de4fa8916b55a24f330eed9f5b0c)
---

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 870e33f84a6..b9c7dda8e62 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -500,7 +500,7 @@ function provision_fix_subobj(subobj, paths)
 	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 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	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 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	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_schema(subobj, message, tmp_schema_path, paths)
 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 @@ function provision_guess()
 	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 @@ function provision_validate(subobj, message)
 		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;