prosody
a344c1120e2b
core/s2smanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/s2smanager.lua @ 5369:a344c1120e2b

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 22 Mar 2013 15:16:43 +0000
parent 5367:56db8f2c8563
child 5447:92b88476873a
line wrap: on
line diff
--- a/core/s2smanager.lua	Fri Mar 22 14:22:46 2013 +0000
+++ b/core/s2smanager.lua	Fri Mar 22 15:16:43 2013 +0000
@@ -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 @@
 	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;