Add lock_globals() and unlock_globals() functions (for when you really need to use...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index b1740f27edc321d99033294eb57a0aed6bcf6d16..42e4eb502d909fe33133eef6b2f6686daf1c79be 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -85,6 +85,9 @@ require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
 
+require "util.array"
+require "util.iterators"
+
 -- Commented to protect us from 
 -- the second kind of people
 --[[ 
@@ -104,16 +107,14 @@ require "util.jid"
 
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
 require "util.datamanager".set_data_path(data_path);
+require "util.datamanager".set_callback(function(username, host, datastore)
+       return config.get(host, "core", "anonymous_login");
+end);
 
 ----------- End of out-of-place code --------------
 
-
 eventmanager.fire_event("server-starting");
 
-
--- setup error handling
-setmetatable(_G, { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end });
-
 local global_ssl_ctx = config.get("*", "core", "ssl");
 if global_ssl_ctx then
        local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
@@ -121,9 +122,9 @@ if global_ssl_ctx then
 end
 
 -- start listening on sockets
-local function do_ports(option, listener, default, conntype)
+function net_activate_ports(option, listener, default, conntype)
        local ports = config.get("*", "core", option) or default;
-       --if type(ports) == "number" then ports = {ports} end;
+       if type(ports) == "number" then ports = {ports} end;
        
        if type(ports) ~= "table" then
                log("error", "core."..option.." is not a table");
@@ -138,9 +139,9 @@ local function do_ports(option, listener, default, conntype)
        end
 end
 
-do_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-do_ports("s2s_ports", "xmppserver", {5269}, "tcp");
-do_ports("legacy_ssl_ports", "xmppclient", {}, "ssl");
+net_activate_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
+net_activate_ports("s2s_ports", "xmppserver", {5269}, "tcp");
+net_activate_ports("legacy_ssl_ports", "xmppclient", {}, "ssl");
 
 if config.get("*", "core", "console_enabled") then
        if cl.get("console") then
@@ -150,6 +151,19 @@ if config.get("*", "core", "console_enabled") then
        end
 end
 
+-- setup error handling
+local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }
+
+function unlock_globals()
+       setmetatable(_G, nil);
+end
+
+function lock_globals()
+       setmetatable(_G, locked_globals_mt);
+end
+
+lock_globals();
+
 eventmanager.fire_event("server-started");
 
 local quitting;