Mercurial > lxmppd-hg-xmllex / changeset
changeset
My merge!!!!
Thu, 04 Jun 2009 05:37:43 +0500
- author
- Waqas Hussain <waqas20@gmail.com>
- date
- Thu, 04 Jun 2009 05:37:43 +0500
- changeset 1295
- ead6d78d2217
- parent 1294
- 39197fe5ae94 (current diff)
- parent 1291
- 22dcd5f06bc4 (diff)
- child 1296
- 5cf4c444d3f9
- child 1301
- d10d84f755b5
My merge!!!!
--- a/core/sessionmanager.lua Wed Jun 03 21:27:32 2009 +0500 +++ b/core/sessionmanager.lua Thu Jun 04 05:37:43 2009 +0500 @@ -105,7 +105,7 @@ 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;
--- a/prosody.cfg.lua.dist Wed Jun 03 21:27:32 2009 +0500 +++ b/prosody.cfg.lua.dist Thu Jun 04 05:37:43 2009 +0500 @@ -54,15 +54,19 @@ "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 = {
