Backed out the backout. Now we're back out.

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index bf5d4c2f02073538b93229618640502b4985bf58..b0fb6cd9b7dc39b21707a15dea3aba408e410cad 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -10,6 +10,7 @@ local type = type;
 local tostring, print = tostring, print;
 
 local _G = _G;
+local debug = debug;
 
 module "modulemanager"
 
@@ -64,23 +65,11 @@ function modulehelpers.add_handler(origin_type, tag, xmlns, handler)
        _add_handler(getfenv(2).module, origin_type, tag, xmlns, handler);
 end
 
-function loadall()
-       load("saslauth");
-       load("legacyauth");
-       load("roster");
-       load("register");
-       load("tls");
-       load("vcard");
-       load("private");
-       load("version");
-       load("dialback");
-end
-
 function load(name)
        local mod, err = loadfile("plugins/mod_"..name..".lua");
        if not mod then
                log("error", "Unable to load module '%s': %s", name or "nil", err or "nil");
-               return;
+               return nil, err;
        end
        
        local pluginenv = setmetatable({ module = { name = name } }, { __index = modulehelpers });
@@ -89,8 +78,9 @@ function load(name)
        local success, ret = pcall(mod);
        if not success then
                log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil");
-               return;
+               return nil, ret;
        end
+       return true;
 end
 
 function handle_stanza(origin, stanza)
@@ -100,14 +90,13 @@ function handle_stanza(origin, stanza)
                log("debug", "Stanza is an <iq/>");
                local child = stanza.tags[1];
                if child then
-                       local xmlns = child.attr.xmlns;
-                       log("debug", "Stanza has xmlns: %s", xmlns);
+                       local xmlns = child.attr.xmlns or xmlns;
+                       log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns);
                        local handler = handlers[origin_type][name][xmlns];
                        if  handler then
                                log("debug", "Passing stanza to mod_%s", handler_info[handler].name);
                                return handler(origin, stanza) or true;
                        end
-
                end
        elseif handlers[origin_type] then
                local handler = handlers[origin_type][name];