From 8a27b5446d8a039a27160aecf1d0488b371b792d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Mon, 19 Jan 2009 10:14:55 +0000 Subject: [PATCH] Fix accesses to the new #jid opaque type. PR: EJABP-1 SVN Revision: 1825 --- ChangeLog | 5 +++++ src/ejabberd_auth_anonymous.erl | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb509b737..d80608647 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-19 Jean-Sébastien Pédron + + * src/ejabberd_auth_anonymous.erl: Fix accesses to the new #jid opaque + type. + 2009-01-16 Jean-Sébastien Pédron Merge from trunk (r1734 to r1752). diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl index 955a0dc06..622c6c500 100644 --- a/src/ejabberd_auth_anonymous.erl +++ b/src/ejabberd_auth_anonymous.erl @@ -54,7 +54,6 @@ plain_password_required/0]). -include("ejabberd.hrl"). --include("jlib.hrl"). -record(anonymous, {us, sid}). %% Create the anonymous table if at least one virtual host has anonymous features enabled @@ -141,7 +140,9 @@ remove_connection(SID, LUser, LServer) -> mnesia:transaction(F). %% Register connection -register_connection(SID, #jid{luser = LUser, lserver = LServer}, Info) -> +register_connection(SID, JID, Info) -> + LUser = exmpp_jid:lnode(JID), + LServer = exmpp_jid:ldomain(JID), case proplists:get_value(auth_module, Info) of undefined -> ok; @@ -155,7 +156,9 @@ register_connection(SID, #jid{luser = LUser, lserver = LServer}, Info) -> end. %% Remove an anonymous user from the anonymous users table -unregister_connection(SID, #jid{luser = LUser, lserver = LServer}, _) -> +unregister_connection(SID, JID, _) -> + LUser = exmpp_jid:lnode(JID), + LServer = exmpp_jid:ldomain(JID), purge_hook(anonymous_user_exist(LUser, LServer), LUser, LServer), remove_connection(SID, LUser, LServer).