From 6210465091c3e82d1a6df362326ff3f92b7012fc Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 24 Feb 2018 19:40:18 +0100 Subject: hostmanager: Add a logging close method in case something tries to close the origin of local-originated stanzas (see #1084) --- core/hostmanager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/hostmanager.lua b/core/hostmanager.lua index 643724c2..106a8ef2 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -92,6 +92,9 @@ function activate(host, host_config) send = host_send; modules = {}; }; + function host_session:close(reason) + log("debug", "Attempt to close host session %s with reason: %s", self.host, reason); + end setmetatable(host_session, host_mt); if not host_config.component_module then -- host host_session.type = "local"; -- cgit v1.2.3 From f7bf94cd0379a9d11e59d6fcb90348d10635377e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 2 Mar 2018 01:51:06 +0100 Subject: prosodyctl: Use correct separator in chown call (fixes #1093) --- prosodyctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prosodyctl b/prosodyctl index c4f51f35..fcfc4c2e 100755 --- a/prosodyctl +++ b/prosodyctl @@ -868,7 +868,7 @@ local function copy(from, to, umask, owner, group) assert(input:close()); assert(output:close()); if owner and group then - local ok = os.execute(("chown %s.%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to))); + local ok = os.execute(("chown %s:%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to))); assert(ok == true or ok == 0, "Failed to change ownership of "..to); end if old_umask then pposix.umask(old_umask); end -- cgit v1.2.3