Mercurial > lxmppd-hg-xmllex / changeset
changeset
Automated merge with http://waqas.ath.cx:8000/
Fri, 12 Jun 2009 11:37:34 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Fri, 12 Jun 2009 11:37:34 +0100
- changeset 1339
- 7d77f92f94c9
- parent 1338
- 0bfc8d866479 (current diff)
- parent 1337
- 16c5aa4696ca (diff)
- child 1340
- f707d0957155
Automated merge with http://waqas.ath.cx:8000/
--- a/plugins/mod_dialback.lua Fri Jun 12 15:33:41 2009 +0500 +++ b/plugins/mod_dialback.lua Fri Jun 12 11:37:34 2009 +0100 @@ -26,7 +26,7 @@ -- 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
