aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-08 22:43:27 +0200
committerKim Alvefur <zash@zash.se>2013-04-08 22:43:27 +0200
commitdc40055961900d21a10d7cf64b06cbe42e003095 (patch)
treec5af87b7a908791401460539778ee94ab2bfe35e
parent94b629076096ad83c60c01af607d3aee160584b4 (diff)
parentaa3cbd503967a0516f104b0f3bccb1f2a5e8fde2 (diff)
downloadprosody-dc40055961900d21a10d7cf64b06cbe42e003095.tar.gz
prosody-dc40055961900d21a10d7cf64b06cbe42e003095.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_s2s/mod_s2s.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 1547345d..eb10cd35 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -140,8 +140,8 @@ function module.add_host(module)
module:log("warn", "The 'disallow_s2s' config option is deprecated, please see http://prosody.im/doc/s2s#disabling");
return nil, "This host has disallow_s2s set";
end
- module:hook("route/remote", route_to_existing_session, 200);
- module:hook("route/remote", route_to_new_session, 100);
+ module:hook("route/remote", route_to_existing_session, -1);
+ module:hook("route/remote", route_to_new_session, -10);
module:hook("s2s-authenticated", make_authenticated, -1);
end