diff options
author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
commit | 983891c9fa8e728aa4680aedc74ec50a0329346e (patch) | |
tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/hostmanager.lua | |
parent | 4adcfb2d185bb95ec430822c772f091b713faa7a (diff) | |
parent | 869da6c240dccfed8c43228ceb989af5faf6c8f1 (diff) | |
download | prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.tar.gz prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.zip |
Merge 0.9->trunk
Diffstat (limited to 'core/hostmanager.lua')
-rw-r--r-- | core/hostmanager.lua | 2 |
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 = {}; }; |