packages: ejabberd/ejabberd-vcard-access-get.patch - Fix bug in the mod_vca...

[areq]

Author: areq                         Date: Tue Apr 13 20:27:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Fix bug in the mod_vcard_ldap.erl changes
  https://support.process-one.net/browse/EJAB-797

---- Files affected:
packages/ejabberd:
   ejabberd-vcard-access-get.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ejabberd/ejabberd-vcard-access-get.patch
diff -u packages/ejabberd/ejabberd-vcard-access-get.patch:1.1 packages/ejabberd/ejabberd-vcard-access-get.patch:1.2
--- packages/ejabberd/ejabberd-vcard-access-get.patch:1.1	Wed Apr  7 22:43:22 2010
+++ packages/ejabberd/ejabberd-vcard-access-get.patch	Tue Apr 13 22:27:40 2010
@@ -110,7 +110,7 @@
  
  set_vcard(User, LServer, VCARD) ->
 diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
-index f4078df..c5c830d 100644
+index f4078df..074bdf7 100644
 --- a/src/mod_vcard_ldap.erl
 +++ b/src/mod_vcard_ldap.erl
 @@ -241,38 +241,47 @@ process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ)
@@ -158,8 +158,8 @@
 +    #jid{lserver = FromLServer} = From,
 +    LServer = State#state.serverhost,
 +    Access = gen_mod:get_module_opt(LServer, ?MODULE, access_get, all),
-+    case ejabberd_auth:is_user_exists(LUser, LServer)
-+	and acl:match_rule(FromLServer, Access, From) of
++    case ejabberd_auth:is_user_exists(LUser, LServer) andalso
++	(acl:match_rule(FromLServer, Access, From) == allow) of
 +	true ->
 +	    process_vcard_ldap_get(LUser, LServer, IQ, State);
 +	_ ->
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ejabberd/ejabberd-vcard-access-get.patch?r1=1.1&r2=1.2&f=u