aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/sessionmanager.lua2
-rw-r--r--prosody.cfg.lua.dist6
2 files changed, 6 insertions, 2 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index bca887da..163c6799 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -105,7 +105,7 @@ function bind_resource(session, resource)
if not hosts[session.host].sessions[session.username] then
local sessions = { sessions = {} };
hosts[session.host].sessions[session.username] = sessions;
- bare_sessions[session.host..'@'..session.username] = sessions;
+ bare_sessions[session.username..'@'..session.host] = sessions;
else
local sessions = hosts[session.host].sessions[session.username].sessions;
local limit = config_get(session.host, "core", "max_resources") or 10;
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 182f8889..c0627091 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -54,15 +54,19 @@ Host "*"
"uptime"; -- Report how long server has been running
"time"; -- Let others know the time here on this server
"ping"; -- Replies to XMPP pings with pongs
+ "register"; -- Allow users to register on this server using a client and change passwords
-- Other specific functionality
- --"register"; -- Allow users to register on this server using a client
--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
--"console"; -- telnet to port 5582 (needs console_enabled = true)
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"httpserver"; -- Serve static files from a directory over HTTP
};
+ -- Disable account creation by default, for security
+ -- For more information see http://prosody.im/doc/creating_accounts
+ allow_registration = false;
+
-- These are the SSL/TLS-related settings. If you don't want
-- to use SSL/TLS, you may comment or remove this
ssl = {