aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-11 01:32:46 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-11 01:32:46 +0100
commit38a7865229c7049bcbfa3e7f78016bf5e988ca28 (patch)
treea0564ac0d43d718d122652133cc4c3a5453f8995
parentd0b87d8ac6edb12b2eb1b0550fe4e273e8720446 (diff)
parentf3aaf833ca073cef76d781a3d27108e27160271e (diff)
downloadprosody-38a7865229c7049bcbfa3e7f78016bf5e988ca28.tar.gz
prosody-38a7865229c7049bcbfa3e7f78016bf5e988ca28.zip
Merge with backout
-rw-r--r--plugins/mod_dialback.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index f3b9e3cf..8c683d8a 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -79,9 +79,7 @@ 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 = nameprep(attr.from);
- -- COMPAT: Fix server's chopness by not including from
- compat_check = true;
+ origin.from_host = attr.from;
end
if not origin.to_host then
-- Just used for friendlier logging