diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-22 15:16:43 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-22 15:16:43 +0000 |
| commit | bcd8f33f5be7555e0c7863b76e950bd9d156afe0 (patch) | |
| tree | 405a0afb10ef1d47dfd38bb35f78b22d3f98864b /core | |
| parent | a2dec278161293bdb918050f2ef7c4f67ecec5b2 (diff) | |
| parent | b1ce27375d21ac9d8fd923b9766b19cc938165d6 (diff) | |
| download | prosody-bcd8f33f5be7555e0c7863b76e950bd9d156afe0.tar.gz prosody-bcd8f33f5be7555e0c7863b76e950bd9d156afe0.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index b034fcae..5777cb8e 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -8,7 +8,7 @@ -local hosts = hosts; +local hosts = prosody.hosts; local tostring, pairs, getmetatable, newproxy, setmetatable = tostring, pairs, getmetatable, newproxy, setmetatable; @@ -38,7 +38,7 @@ function new_incoming(conn) return session; end -function new_outgoing(from_host, to_host, connect) +function new_outgoing(from_host, to_host) local host_session = { to_host = to_host, from_host = from_host, host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" }; hosts[from_host].s2sout[to_host] = host_session; |