sessionmanager: Newly created sessions shouldn't have a priority. Fixes one of the...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 0fd0b7354fb5dcbdb967144b27e2ed6da2207f0a..b7fb95fe3d3582b45da74206ffd2b03bb29bd475 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -17,10 +17,13 @@ CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
-       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
-       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath
+       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
+       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
+package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
+package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
+
 if CFG_DATADIR then
        if os.getenv("HOME") then
                CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
@@ -135,8 +138,11 @@ 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");
+require "util.datamanager".add_callback(function(username, host, datastore, data)
+       if config.get(host, "core", "anonymous_login") then
+               return false;
+       end
+       return username, host, datastore, data;
 end);
 
 ----------- End of out-of-place code --------------