diff options
| -rw-r--r-- | man/prosodyctl.man | 5 | ||||
| -rw-r--r-- | man/prosodyctl.markdown | 3 | ||||
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_storage_internal.lua | 8 | ||||
| -rwxr-xr-x | prosodyctl | 2 |
5 files changed, 18 insertions, 2 deletions
diff --git a/man/prosodyctl.man b/man/prosodyctl.man index 4854a0a7..f7bf44d1 100644 --- a/man/prosodyctl.man +++ b/man/prosodyctl.man @@ -158,6 +158,11 @@ Use the specified config file instead of the default. .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 diff --git a/man/prosodyctl.markdown b/man/prosodyctl.markdown index e4c355a2..4dde284f 100644 --- a/man/prosodyctl.markdown +++ b/man/prosodyctl.markdown @@ -137,6 +137,9 @@ OPTIONS `--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. diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index b40b8a9a..1dcce4e4 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -141,7 +141,7 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event) limit = qmax + 1; before = before; after = after; reverse = reverse; - total = use_total; + total = use_total or qmax == 0; }); if not data then diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua index 0a382cee..76052575 100644 --- a/plugins/mod_storage_internal.lua +++ b/plugins/mod_storage_internal.lua @@ -62,7 +62,13 @@ end 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 @@ -932,6 +932,8 @@ function commands.cert(arg) 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.") |