--- a/core/s2smanager.lua	Fri Dec 24 04:48:38 2010 +0000
+++ b/core/s2smanager.lua	Fri Dec 24 04:49:30 2010 +0000
@@ -177,6 +177,8 @@
 		
 		hosts[from_host].s2sout[to_host] = host_session;
 		
+		host_session.close = destroy_session; -- This gets replaced by xmppserver_listener later
+		
 		local log;
 		do
 			local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$");