diff options
| author | Kim Alvefur <zash@zash.se> | 2018-03-06 01:45:58 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-03-06 01:45:58 +0100 |
| commit | 3a3a5f55eb92b38f9fa4470d74090cabfa44df27 (patch) | |
| tree | b9780166d9f854ccf1a7d840f8f6b01f4e6628c1 | |
| parent | 181caccc86df9d4a87b0a76a7d599dbdadc16483 (diff) | |
| parent | bde433b14c7b4880a4325ba27ef1e2dfafada426 (diff) | |
| download | prosody-3a3a5f55eb92b38f9fa4470d74090cabfa44df27.tar.gz prosody-3a3a5f55eb92b38f9fa4470d74090cabfa44df27.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/hostmanager.lua | 3 | ||||
| -rwxr-xr-x | prosodyctl | 2 |
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"; @@ -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 |