aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-06-12 11:37:34 +0100
committerMatthew Wild <mwild1@gmail.com>2009-06-12 11:37:34 +0100
commit9df2c1f99bab89a7e2f3f18ec380eced5df7dff4 (patch)
tree16e547792f44f908a88842de8d4166eff1cdc667
parent6f8f5d665c9fe83ee1b6560a3c5cab236be1a298 (diff)
parent69bb55c678a78c84a8b12d23a13e461964b155f1 (diff)
downloadprosody-9df2c1f99bab89a7e2f3f18ec380eced5df7dff4.tar.gz
prosody-9df2c1f99bab89a7e2f3f18ec380eced5df7dff4.zip
Automated merge with http://waqas.ath.cx:8000/
-rw-r--r--plugins/mod_dialback.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index b1bc3ae3..947bd2e1 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -26,7 +26,7 @@ module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
-- We are being asked to verify the key, to ensure it was generated by us
origin.log("debug", "verifying that dialback key is ours...");
local attr = stanza.attr;
- -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
+ -- COMPAT: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
--if attr.from ~= origin.to_host then error("invalid-from"); end
local type;
if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then