Merge 0.10->trunk

3 files changed, 16 insertions, 8 deletions

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index f29245b2..a5136f6c 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -36,11 +36,13 @@ function module.add_host(module)
 	
 	local env = module.environment;
 	env.connected = false;
+	env.session = false;
 
 	local send;
 
 	local function on_destroy(session, err)
 		env.connected = false;
+		env.session = false;
 		send = nil;
 		session.on_destroy = nil;
 	end
@@ -73,12 +75,18 @@ function module.add_host(module)
 		end
 		
 		if env.connected then
-			module:log("error", "Second component attempted to connect, denying connection");
-			session:close{ condition = "conflict", text = "Component already connected" };
-			return true;
+			local policy = module:get_option_string("component_conflict_resolve", "kick_new");
+			if policy == "kick_old" then
+				env.session:close{ condition = "conflict", text = "Replaced by a new connection" };
+			else -- kick_new
+				module:log("error", "Second component attempted to connect, denying connection");
+				session:close{ condition = "conflict", text = "Component already connected" };
+				return true;
+			end
 		end
 		
 		env.connected = true;
+		env.session = session;
 		send = session.send;
 		session.on_destroy = on_destroy;
 		session.component_validate_from = module:get_option_boolean("validate_from_addresses", true);
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index 7c6033a3..395406cd 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -103,11 +103,12 @@ function s2sout.attempt_connection(host_session, err)
 		local handle;
 		handle = adns.lookup(function (answer)
 			handle = nil;
+			local srv_hosts = { answer = answer };
+			host_session.srv_hosts = srv_hosts;
+			host_session.srv_choice = 0;
 			host_session.connecting = nil;
 			if answer and #answer > 0 then
 				log("debug", "%s has SRV records, handling...", to_host);
-				local srv_hosts = { answer = answer };
-				host_session.srv_hosts = srv_hosts;
 				for _, record in ipairs(answer) do
 					t_insert(srv_hosts, record.srv);
 				end
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 39c4649e..69aafe82 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -40,17 +40,16 @@ do
 	local modhost = module.host;
 	local parent = modhost:match("%.(.*)$");
 
-	local global_ssl = rawgetopt("*",     "ssl") or NULL;
 	local parent_ssl = rawgetopt(parent,  "ssl") or NULL;
 	local host_ssl   = rawgetopt(modhost, "ssl") or parent_ssl;
 
 	local global_c2s = rawgetopt("*",     "c2s_ssl") or NULL;
 	local parent_c2s = rawgetopt(parent,  "c2s_ssl") or NULL;
-	local host_c2s   = rawgetopt(modhost, "c2s_ssl") or parent_ssl;
+	local host_c2s   = rawgetopt(modhost, "c2s_ssl") or parent_c2s;
 
 	local global_s2s = rawgetopt("*",     "s2s_ssl") or NULL;
 	local parent_s2s = rawgetopt(parent,  "s2s_ssl") or NULL;
-	local host_s2s   = rawgetopt(modhost, "s2s_ssl") or parent_ssl;
+	local host_s2s   = rawgetopt(modhost, "s2s_ssl") or parent_s2s;
 
 	ssl_ctx_c2s, err, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
 	if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err); end