mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that plugins...

[prosody.git] / plugins / mod_pubsub.lua

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 22969ab5f067d9fee54364c8ffc933d9fcf6bb99..04f2b61500708425ee7c7a9c4eb633336809aaca 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -39,7 +39,7 @@ local pubsub_errors = {
        ["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
        ["item-not-found"] = { "cancel", "item-not-found" };
        ["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
-       ["forbidden"] = { "cancel", "forbidden" };
+       ["forbidden"] = { "auth", "forbidden" };
 };
 function pubsub_error_reply(stanza, error)
        local e = pubsub_errors[error];
@@ -80,9 +80,6 @@ end
 
 function handlers.get_subscriptions(origin, stanza, subscriptions)
        local node = subscriptions.attr.node;
-       if not node then
-               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
-       end
        local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
        if not ok then
                return origin.send(pubsub_error_reply(stanza, ret));