aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-06-23 15:58:56 +0100
committerMatthew Wild <mwild1@gmail.com>2009-06-23 15:58:56 +0100
commitf00a5d70b30b132b763b2e20c68accb8ce52789d (patch)
tree0741204836fedee0caea15f4607bd996d7e5fdab /prosody
parent3f141a44c2b4564e5d88748f76f53f5fec6c1a33 (diff)
parent54bbd9c98aa6e40463982ec2a92fa9a444704b43 (diff)
downloadprosody-f00a5d70b30b132b763b2e20c68accb8ce52789d.tar.gz
prosody-f00a5d70b30b132b763b2e20c68accb8ce52789d.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody7
1 files changed, 5 insertions, 2 deletions
diff --git a/prosody b/prosody
index 0fd0b735..290aa874 100755
--- a/prosody
+++ b/prosody
@@ -135,8 +135,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 --------------