aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-03-06 01:45:58 +0100
committerKim Alvefur <zash@zash.se>2018-03-06 01:45:58 +0100
commitd03099c7ccb22d9f6fc153fdc528bd8931be4c31 (patch)
treeb9780166d9f854ccf1a7d840f8f6b01f4e6628c1
parent980816bca6d2f3deafb5db0669453c538415b358 (diff)
parentf7bf94cd0379a9d11e59d6fcb90348d10635377e (diff)
downloadprosody-d03099c7ccb22d9f6fc153fdc528bd8931be4c31.tar.gz
prosody-d03099c7ccb22d9f6fc153fdc528bd8931be4c31.zip
Merge 0.10->trunk
-rw-r--r--core/hostmanager.lua3
-rwxr-xr-xprosodyctl2
2 files changed, 4 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 43dabf99..9acca517 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -84,6 +84,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";
diff --git a/prosodyctl b/prosodyctl
index 947316a6..63dfbd65 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -866,7 +866,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