# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1395771398 -3600
# Node ID b3ceb7627e27aba484b3887d36e7a0c3007b4b1c
# Parent  7bbe22d8dd09959fe67124bf50585765311f13bd# Parent  1b5ca55bf895d19a8c34a13835cdd0d46c330dd5
Merge 0.9->0.10

diff -r 7bbe22d8dd09 -r b3ceb7627e27 core/modulemanager.lua
--- a/core/modulemanager.lua	Sat Mar 22 14:53:17 2014 +0100
+++ b/core/modulemanager.lua	Tue Mar 25 19:16:38 2014 +0100
@@ -30,7 +30,7 @@
 end
 
 local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"};
-local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"};
+local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
 
 -- We need this to let modules access the real global namespace
 local _G = _G;
diff -r 7bbe22d8dd09 -r b3ceb7627e27 plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Sat Mar 22 14:53:17 2014 +0100
+++ b/plugins/mod_saslauth.lua	Tue Mar 25 19:16:38 2014 +0100
@@ -197,7 +197,7 @@
 		return s2s_external_auth(session, stanza)
 	end
 
-	if session.type ~= "c2s_unauthed" then return; end
+	if session.type ~= "c2s_unauthed" or module:get_host_type() ~= "local" then return; end
 
 	if session.sasl_handler and session.sasl_handler.selected then
 		session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one
diff -r 7bbe22d8dd09 -r b3ceb7627e27 prosodyctl
--- a/prosodyctl	Sat Mar 22 14:53:17 2014 +0100
+++ b/prosodyctl	Tue Mar 25 19:16:38 2014 +0100
@@ -687,7 +687,12 @@
 				conf.distinguished_name[k] = nv ~= "." and nv or nil;
 			end
 		end
-		local conf_file = io.open(conf_filename, "w");
+		local conf_file, err = io.open(conf_filename, "w");
+		if not conf_file then
+			show_warning("Could not open OpenSSL config file for writing");
+			show_warning(err);
+			os.exit(1);
+		end
 		conf_file:write(conf:serialize());
 		conf_file:close();
 		print("");