svn commit: samba r23907 - in branches/SAMBA_4_0/source/scripting/libjs: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-07-17 00:10:53 +0000 (Tue, 17 Jul 2007)
New Revision: 23907

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23907

Log:
Fix bug 4790 reported by mwallnoefer at yahoo.de:

Before the provisioning enters to the function provision_default_paths (in
scripting/libjs/provision.js), the variable subobj.DNSDOMAIN isn't properly set
(for example for the filename of the DNS zonefile).

Andrew Bartlett


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-07-17 00:09:56 UTC (rev 23906)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-07-17 00:10:53 UTC (rev 23907)
@@ -370,6 +370,8 @@
 
 function provision_default_paths(subobj)
 {
+	/* subobj.DNSDOMAIN isn't available at this point */
+	var dnsdomain = strlower(subobj.REALM);
 	var lp = loadparm_init();
 	var paths = new Object();
 	paths.smbconf = lp.get("config file");
@@ -383,12 +385,12 @@
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
-	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
+	paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
 	paths.winsdb = "wins.ldb";
 	paths.ldapdir = lp.get("private dir") + "/ldap";
-	paths.ldap_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + ".ldif";
-	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-config.ldif";
-	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-schema.ldif";
+	paths.ldap_basedn_ldif = paths.ldapdir + "/" + dnsdomain + ".ldif";
+	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
+	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
 
 	paths.sysvol = lp.get("sysvol", "path");
 
@@ -399,7 +401,7 @@
 	paths.netlogon = lp.get("netlogon", "path");
 	
 	if (paths.netlogon == undefined) {
-		paths.netlogon = paths.sysvol + "/" + subobj.DNSDOMAIN + "/scripts";
+		paths.netlogon = paths.sysvol + "/" + dnsdomain + "/scripts";
 	}
 
 	return paths;