aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_register.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-24 22:40:53 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-24 22:40:53 +0000
commit808ba7e691f4fbc36a380204ea4cce1c46d9b69b (patch)
treef3e1b92c3447f9927e655f62b1218c2fd4ed4393 /plugins/mod_register.lua
parentd16d14ade1716171913200e085f1af12e6c819eb (diff)
parentb0e0c82d16c2b371508d7a4db4ff3b62341ccd5d (diff)
downloadprosody-808ba7e691f4fbc36a380204ea4cce1c46d9b69b.tar.gz
prosody-808ba7e691f4fbc36a380204ea4cce1c46d9b69b.zip
Merge 0.7/waqas->0.7/MattJ
Diffstat (limited to 'plugins/mod_register.lua')
-rw-r--r--plugins/mod_register.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 2a25d1d0..b8d142f7 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -12,6 +12,7 @@ local st = require "util.stanza";
local datamanager = require "util.datamanager";
local usermanager_user_exists = require "core.usermanager".user_exists;
local usermanager_create_user = require "core.usermanager".create_user;
+local usermanager_set_password = require "core.usermanager".set_password;
local datamanager_store = require "util.datamanager".store;
local os_time = os.time;
local nodeprep = require "util.encodings".stringprep.nodeprep;
@@ -34,7 +35,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
local username, host = session.username, session.host;
--session.send(st.error_reply(stanza, "cancel", "not-allowed"));
--return;
- usermanager_create_user(username, nil, host); -- Disable account
+ usermanager_set_password(username, host, nil); -- Disable account
-- FIXME the disabling currently allows a different user to recreate the account
-- we should add an in-memory account block mode when we have threading
session.send(st.reply(stanza));
@@ -69,7 +70,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
username = nodeprep(table.concat(username));
password = table.concat(password);
if username == session.username then
- if usermanager_create_user(username, password, session.host) then -- password change -- TODO is this the right way?
+ if usermanager_set_password(username, session.host, password) then
session.send(st.reply(stanza));
else
-- TODO unable to write file, file may be locked, etc, what's the correct error?