aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-25 01:42:59 +0200
committerKim Alvefur <zash@zash.se>2017-04-25 01:42:59 +0200
commitd10300eca4067bdc68a16675a4065f608c88381d (patch)
tree76b402f43306dd2f1a20dd5b16f9fe1bf9c15a42
parent706849aa1ef9f5f2f6494d14d7de0ac9e1647190 (diff)
parent237f991e4f843ea2448fac2563149b6671e5c885 (diff)
downloadprosody-d10300eca4067bdc68a16675a4065f608c88381d.tar.gz
prosody-d10300eca4067bdc68a16675a4065f608c88381d.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_admin_telnet.lua2
-rw-r--r--plugins/mod_pep.lua15
-rwxr-xr-xprosodyctl2
-rw-r--r--util-src/crand.c4
-rw-r--r--util/prosodyctl.lua2
5 files changed, 21 insertions, 4 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 2f5d9f63..eae72e61 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -325,7 +325,7 @@ end
function def_env.server:memory()
if not has_pposix or not pposix.meminfo then
- return true, "Lua is using "..collectgarbage("count");
+ return true, "Lua is using "..human(collectgarbage("count"));
end
local mem, lua_mem = pposix.meminfo(), collectgarbage("count");
local print = self.session.print;
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 5d6485fa..1025be37 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -182,7 +182,8 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event)
payload.attr.id = id;
session.send(st.reply(stanza));
module:fire_event("pep-publish-item", {
- node = node, user = jid_bare(session.full_jid), actor = session.jid, id = id, session = session, item = st.clone(payload);
+ node = node, user = jid_bare(session.full_jid), actor = session.jid,
+ id = id, session = session, item = st.clone(payload);
});
return true;
else
@@ -293,11 +294,21 @@ module:hook("account-disco-items", function(event)
if user_data then
for node, _ in pairs(user_data) do
- reply:tag('item', {jid=bare, node=node}):up(); -- TODO we need to handle queries to these nodes
+ reply:tag('item', {jid=bare, node=node}):up();
end
end
end);
+module:hook("account-disco-info-node", function (event)
+ local session, stanza, node = event.origin, event.stanza, event.node;
+ local user = stanza.attr.to;
+ local user_data = data[user];
+ if user_data and user_data[node] then
+ event.exists = true;
+ event.reply:tag('identity', {category='pubsub', type='leaf'}):up();
+ end
+end);
+
module:hook("resource-unbind", function (event)
local user_bare_jid = event.session.username.."@"..event.session.host;
if not bare_sessions[user_bare_jid] then -- User went offline
diff --git a/prosodyctl b/prosodyctl
index 17acbed1..92363310 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -936,7 +936,7 @@ function commands.cert(arg)
return cert_commands[subcmd](arg);
end
end
- show_usage("cert config|request|generate|key", "Helpers for generating X.509 certificates and keys.")
+ show_usage("cert config|request|generate|key|import", "Helpers for generating X.509 certificates and keys.")
end
function commands.check(arg)
diff --git a/util-src/crand.c b/util-src/crand.c
index d4b84327..7eea1f2b 100644
--- a/util-src/crand.c
+++ b/util-src/crand.c
@@ -29,6 +29,10 @@
#if defined(WITH_GETRANDOM)
+#ifndef __GLIBC_PREREQ
+#define __GLIBC_PREREQ(a,b) 0
+#endif
+
#if ! __GLIBC_PREREQ(2,25)
#include <unistd.h>
#include <sys/syscall.h>
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 7c9a3c19..8ae051ae 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -187,6 +187,8 @@ local function getpid()
return false, "invalid-pidfile";
end
+ pidfile = config.resolve_relative_path(prosody.paths.data, pidfile);
+
local modules_enabled = set.new(config.get("*", "modules_disabled"));
if prosody.platform ~= "posix" or modules_enabled:contains("posix") then
return false, "no-posix";