aboutsummaryrefslogtreecommitdiffstats
path: root/core/hostmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
committerKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
commit2bde8103f5dba708e6e7a9b0773eba493bfefa7c (patch)
treefc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/hostmanager.lua
parentbcd8f33f5be7555e0c7863b76e950bd9d156afe0 (diff)
parentaa0eb8fdc87589433a1cd5d03f136fb6f32a7426 (diff)
downloadprosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.tar.gz
prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.zip
Merge 0.9->trunk
Diffstat (limited to 'core/hostmanager.lua')
-rw-r--r--core/hostmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 40401e48..06ba72a1 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -74,7 +74,7 @@ function activate(host, host_config)
host = host;
s2sout = {};
events = events_new();
- dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
+ dialback_secret = configmanager.get(host, "dialback_secret") or uuid_gen();
send = host_send;
modules = {};
};