# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1520297158 -3600
# Node ID 7b9ffddc4276aea9c9b3ddc0e9edc0479e82073c
# Parent  5de663cef5087111b3dd13e853858a9ab9e92608# Parent  48999871738711d3f7b0947424c01885c18eeaf5
Merge 0.10->trunk

diff -r 5de663cef508 -r 7b9ffddc4276 core/hostmanager.lua
--- a/core/hostmanager.lua	Sat Mar 03 20:55:46 2018 +0100
+++ b/core/hostmanager.lua	Tue Mar 06 01:45:58 2018 +0100
@@ -84,6 +84,9 @@
 		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 -r 5de663cef508 -r 7b9ffddc4276 prosodyctl
--- a/prosodyctl	Sat Mar 03 20:55:46 2018 +0100
+++ b/prosodyctl	Tue Mar 06 01:45:58 2018 +0100
@@ -866,7 +866,7 @@
 	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