r23907: Fix bug 4790 reported by mwallnoefer@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

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index c0816cc2a5758deb6e9294f58c599c829a55346d..02b39068fcc16700f9e690e545989f4a81d5de8a 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -370,6 +370,8 @@ function setup_file(template, message, fname, subobj)
 
 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 @@ function provision_default_paths(subobj)
        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 @@ function provision_default_paths(subobj)
        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;