Diff

core/hostmanager.lua @ 1487:66f18c18befa

Merge with main branch.
author Tobias Markmann <tm@ayena.de>
date Sun, 05 Jul 2009 19:05:25 +0200
parent 1467:fc420e9585c2
child 1522:569d58d21612
line wrap: on
line diff
--- a/core/hostmanager.lua	Sun Jul 05 19:05:03 2009 +0200
+++ b/core/hostmanager.lua	Sun Jul 05 19:05:25 2009 +0200
@@ -27,7 +27,12 @@
 eventmanager.add_event_hook("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
-	hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {}, events = events_new() };
+	hosts[host] = {type = "local", connected = true, sessions = {}, 
+	               host = host, s2sout = {}, events = events_new(), 
+	               disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
+	                 or (configmanager.get(host, "core", "anonymous_login") 
+	                     and (configmanager.get(host, "core", "disallow_s2s") ~= false))
+	              };
 	log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
 	eventmanager.fire_event("host-activated", host, host_config);
 end