Diff

plugins/mod_saslauth.lua @ 5364:61cf6b84ae81

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 22 Mar 2013 14:22:46 +0000
parent 5362:612467e263af
child 5535:0df0afc041d7
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua	Wed Mar 20 20:35:59 2013 +0000
+++ b/plugins/mod_saslauth.lua	Fri Mar 22 14:22:46 2013 +0000
@@ -11,7 +11,6 @@
 local st = require "util.stanza";
 local sm_bind_resource = require "core.sessionmanager".bind_resource;
 local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
-local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
 local base64 = require "util.encodings".base64;
 
 local cert_verify_identity = require "util.x509".verify_identity;
@@ -90,7 +89,7 @@
 	session:reset_stream();
 	session:open_stream();
 
-	s2s_make_authenticated(session, session.to_host);
+	module:fire_event("s2s-authenticated", { session = session, host = session.to_host });
 	return true;
 end)
 
@@ -187,7 +186,7 @@
 
 	local domain = text ~= "" and text or session.from_host;
 	module:log("info", "Accepting SASL EXTERNAL identity from %s", domain);
-	s2s_make_authenticated(session, domain);
+	module:fire_event("s2s-authenticated", { session = session, host = domain });
 	session:reset_stream();
 	return true
 end