--- a/man/prosodyctl.man Thu Jul 06 11:22:16 2017 +0200
+++ b/man/prosodyctl.man Thu Jul 06 11:24:36 2017 +0200
@@ -158,6 +158,11 @@
.RS
.RE
.TP
+.B \f[C]\-\-root\f[]
+Don\[aq]t drop root privileges.
+.RS
+.RE
+.TP
.B \f[C]\-\-help\f[]
Display help text for the specified command.
.RS
--- a/man/prosodyctl.markdown Thu Jul 06 11:22:16 2017 +0200
+++ b/man/prosodyctl.markdown Thu Jul 06 11:24:36 2017 +0200
@@ -137,6 +137,9 @@
`--config filename`
: Use the specified config file instead of the default.
+`--root`
+: Don't drop root privileges.
+
`--help`
: Display help text for the specified command.
--- a/plugins/mod_mam/mod_mam.lua Thu Jul 06 11:22:16 2017 +0200
+++ b/plugins/mod_mam/mod_mam.lua Thu Jul 06 11:24:36 2017 +0200
@@ -141,7 +141,7 @@
limit = qmax + 1;
before = before; after = after;
reverse = reverse;
- total = use_total;
+ total = use_total or qmax == 0;
});
if not data then
--- a/plugins/mod_storage_internal.lua Thu Jul 06 11:22:16 2017 +0200
+++ b/plugins/mod_storage_internal.lua Thu Jul 06 11:24:36 2017 +0200
@@ -62,7 +62,13 @@
function archive:find(username, query)
local items, err = datamanager.list_load(username, host, self.store);
- if not items then return items, err; end
+ if not items then
+ if err then
+ return items, err;
+ else
+ return function () end, 0;
+ end
+ end
local count = #items;
local i = 0;
if query then
--- a/prosodyctl Thu Jul 06 11:22:16 2017 +0200
+++ b/prosodyctl Thu Jul 06 11:24:36 2017 +0200
@@ -932,6 +932,8 @@
return 1;
end
return cert_commands[subcmd](arg);
+ elseif subcmd == "check" then
+ return commands.check({"certs"});
end
end
show_usage("cert config|request|generate|key|import", "Helpers for generating X.509 certificates and keys.")