projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->0.10
[prosody.git]
/
core
/
hostmanager.lua
diff --git
a/core/hostmanager.lua
b/core/hostmanager.lua
index 91b052d1725b303e5f69a1f7a57fa36ac76c4769..7f9d1610f0a9a80e96a7dc2cb2f35d08aa8add79 100644
(file)
--- a/
core/hostmanager.lua
+++ b/
core/hostmanager.lua
@@
-13,7
+13,6
@@
local disco_items = require "util.multitable".new();
local NULL = {};
local jid_split = require "util.jid".split;
local NULL = {};
local jid_split = require "util.jid".split;
-local uuid_gen = require "util.uuid".generate;
local log = require "util.logger".init("hostmanager");
local log = require "util.logger".init("hostmanager");
@@
-74,7
+73,6
@@
function activate(host, host_config)
host = host;
s2sout = {};
events = events_new();
host = host;
s2sout = {};
events = events_new();
- dialback_secret = configmanager.get(host, "dialback_secret") or uuid_gen();
send = host_send;
modules = {};
};
send = host_send;
modules = {};
};