Merge 0.9->trunk

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 93eac3f2e0b84e2e53ebfc3f2a0b6d1d93fd5fd7..4d3c47908e864f60ed7bba4e0456d5cf994f48fb 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -227,6 +227,7 @@ local function make_host(hostname)
        return {
                type = "local",
                events = prosody.events,
+               modules = {},
                users = require "core.usermanager".new_null_provider(hostname)
        };
 end
@@ -724,7 +725,7 @@ function cert_commands.generate(arg)
        if #arg >= 1 and arg[1] ~= "--help" then
                local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".cert";
                if ask_overwrite(cert_filename) then
-                       return nil, conf_filename;
+                       return nil, cert_filename;
                end
                local _, key_filename = cert_commands.key({arg[1]});
                local _, conf_filename = cert_commands.config(arg);