mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2018-03-06 01:45:58 +01:00
commit d03099c7cc
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/hostmanager.lua
View file

@ -84,6 +84,9 @@ function activate(host, host_config)
send = host_send; send = host_send;
modules = {}; 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); setmetatable(host_session, host_mt);
if not host_config.component_module then -- host if not host_config.component_module then -- host
host_session.type = "local"; host_session.type = "local";

2
prosodyctl
View file

@ -866,7 +866,7 @@ local function copy(from, to, umask, owner, group)
assert(input:close()); assert(input:close());
assert(output:close()); assert(output:close());
if owner and group then 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); assert(ok == true or ok == 0, "Failed to change ownership of "..to);
end end
if old_umask then pposix.umask(old_umask); end if old_umask then pposix.umask(old_umask); end