diff mod_smacks/mod_smacks.lua @ 931:e20e94d75fe3

Merge (someone needs to remember to pull...)
author Marco Cirillo <maranda@lightwitch.org>
date Tue, 12 Mar 2013 19:09:26 +0100
parents 720b8268778e
children fabff75bfc3f
line wrap: on
line diff
--- a/mod_smacks/mod_smacks.lua	Tue Mar 12 19:05:59 2013 +0100
+++ b/mod_smacks/mod_smacks.lua	Tue Mar 12 19:09:26 2013 +0100
@@ -249,6 +249,14 @@
 end);
 
 module:hook_stanza(xmlns_sm, "resume", function (session, stanza)
+	if session.full_jid then
+		session.log("debug", "Tried to resume after resource binding");
+		session.send(st.stanza("failed", sm_attr)
+			:tag("unexpected-request", { xmlns = xmlns_errors })
+		);
+		return true;
+	end
+
 	local id = stanza.attr.previd;
 	local original_session = session_registry[id];
 	if not original_session then