aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-11 01:45:36 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-11 01:45:36 +0100
commit03e9d0f7d34af35b98cd15411872ee4d3c906837 (patch)
tree3720c0200aa7c43dbfcd804390a2a59fbb295f1f
parent163e1b4789466fe274179ab789a6dd435ef91700 (diff)
parent5a95f10b210e59072916230230ee260eca3dd551 (diff)
downloadprosody-03e9d0f7d34af35b98cd15411872ee4d3c906837.tar.gz
prosody-03e9d0f7d34af35b98cd15411872ee4d3c906837.zip
Merge with backout
-rw-r--r--plugins/mod_dialback.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 8c683d8a..4b19f2d9 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -79,7 +79,11 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
local compat_check;
if not origin.from_host then
-- Just used for friendlier logging
- origin.from_host = attr.from;
+ origin.from_host = nameprep(attr.from);
+ if not origin.from_host then
+ origin.log("debug", "We need to know where to connect but remote server blindly refuses to tell us and to comply to specs, closing connection.");
+ origin:close("invalid-from");
+ end
end
if not origin.to_host then
-- Just used for friendlier logging