net.dns: Close voided sockets, so they don't stay in net.server

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 3aba5786c5f82048ade6fc7e9a8270be78d7c8e3..417d70375bd8d315780db7e32e83496da71267a6 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -10,11 +10,13 @@ local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
 local ipairs = ipairs;
+local pairs = pairs;
 local jid_bare = require "util.jid".bare;
 local jid_prep = require "util.jid".prep;
 local config = require "core.configmanager";
 local hosts = hosts;
 local sasl_new = require "util.sasl".new;
+local storagemanager = require "core.storagemanager";
 
 local prosody = _G.prosody;
 
@@ -88,7 +90,14 @@ function create_user(username, password, host)
 end
 
 function delete_user(username, host)
-       return hosts[host].users.delete_user(username);
+       local ok, err = hosts[host].users.delete_user(username);
+       if not ok then return nil, err; end
+       prosody.events.fire_event("user-deleted", { username = username, host = host });
+       return storagemanager.purge(username, host);
+end
+
+function users(host)
+       return hosts[host].users.users();
 end
 
 function get_sasl_handler(host, session)