diff mod_privilege/mod_privilege.lua @ 1994:f263fcf1b0ed

Merge with Goffi
author Kim Alvefur <zash@zash.se>
date Mon, 21 Dec 2015 12:24:21 +0100
parents c4da3d9f212d
children e9226e3bdeba
line wrap: on
line diff
--- a/mod_privilege/mod_privilege.lua	Sun Dec 20 21:55:49 2015 +0100
+++ b/mod_privilege/mod_privilege.lua	Mon Dec 21 12:24:21 2015 +0100
@@ -8,11 +8,11 @@
 
 -- TODO: manage external <presence/> (for "roster" presence permission) when the account with the roster is offline
 
-local jid = require("util/jid")
-local set = require("util/set")
-local st = require("util/stanza")
-local roster_manager = require("core/rostermanager")
-local user_manager = require("core/usermanager")
+local jid = require("util.jid")
+local set = require("util.set")
+local st = require("util.stanza")
+local roster_manager = require("core.rostermanager")
+local usermanager_user_exists = require "core.usermanager".user_exists;
 local hosts = prosody.hosts
 local full_sessions = prosody.full_sessions;
 
@@ -250,7 +250,7 @@
 	if session_privileges and _ROSTER_SET_PERM:contains(session_privileges.roster) then
 		module:log("debug", "Roster set from allowed privileged entity received")
 		-- following code is adapted from mod_remote_roster
-		if not(user_manager.user_exists(from_node, from_host)) then return; end
+		if not(usermanager_user_exists(from_node, from_host)) then return; end
 		local roster = roster_manager.load_roster(from_node, from_host);
 		if not(roster) then return; end