diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-06-04 05:37:43 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-06-04 05:37:43 +0500 |
| commit | 42fe90c6c853c20f296baa476d647d7cd57f9279 (patch) | |
| tree | 8da482b6e94e76b5003ac01aeb36bdd86a447399 | |
| parent | 193f981279684c9ca99709c2d42ad300b7bf2515 (diff) | |
| parent | 6bf427e2ebbca67cc47fdbb2648599e96626d546 (diff) | |
| download | prosody-42fe90c6c853c20f296baa476d647d7cd57f9279.tar.gz prosody-42fe90c6c853c20f296baa476d647d7cd57f9279.zip | |
My merge!!!!
| -rw-r--r-- | core/sessionmanager.lua | 2 | ||||
| -rw-r--r-- | prosody.cfg.lua.dist | 6 |
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 = {
|