summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-17 00:10:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:09 -0500
commitd1bfe56048e6dca7057b8687262714156e230af0 (patch)
treec4c6a10e1442ea15363cd37b48d54b6d76769676
parentc87d5017d9ef63d4e758ff0904ba417bfa669858 (diff)
downloadsamba-d1bfe56048e6dca7057b8687262714156e230af0.tar.gz
samba-d1bfe56048e6dca7057b8687262714156e230af0.tar.bz2
samba-d1bfe56048e6dca7057b8687262714156e230af0.zip
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 (This used to be commit 07a9db1438df93442c5b50b1b97ca69662749608)
-rw-r--r--source4/scripting/libjs/provision.js12
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c0816cc2a5..02b39068fc 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/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;