aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
committerKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
commita65cd04e353b849f6a3cda6ca746378dd309ee28 (patch)
treed54d6743becde2246fed6859f25ec6ee72e0d080
parent87805f6e4ed7b0eef2c92cea969da097a53912fe (diff)
parent39bcea0025949af9de9555dee3c2c3f9a5cb7249 (diff)
downloadprosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.tar.gz
prosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.zip
Merge 0.10->trunk
-rw-r--r--man/prosodyctl.man5
-rw-r--r--man/prosodyctl.markdown3
-rw-r--r--plugins/mod_mam/mod_mam.lua2
-rw-r--r--plugins/mod_storage_internal.lua8
-rwxr-xr-xprosodyctl2
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
diff --git a/prosodyctl b/prosodyctl
index e1f3e321..d1634c32 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -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.")