From 860d8525ee474a1994ed08c149a0e2ac3f7f6953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Fri, 5 Nov 2010 03:54:56 +0100 Subject: [PATCH] Remove dead code for NS_VCARD iq packets from ejabberd_c2s For EJAB-1045, the special NS_VCARD block for handling incoming vcard iqs on behalf of clients has already been restricted to cases where the user or resource part of the recipient is empty. But then the packets should not have been routed to the c2s process anyway. This patch completely removes it. --- src/ejabberd_c2s.erl | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 1ecb94ff8..55b42fa6c 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1290,20 +1290,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) -> #xmlel{attrs = Attrs} when ?IS_IQ(Packet) -> case exmpp_iq:is_request(Packet) of true -> - ToNode = exmpp_jid:node(To), - ToResource = exmpp_jid:resource(To), case exmpp_iq:get_request(Packet) of - #xmlel{ns = ?NS_VCARD} when (ToNode == <<"">>) or (ToResource == <<"">>) -> - Host = StateData#state.server, - case ets:lookup(sm_iqtable, {?NS_VCARD, Host}) of - [{_, Module, Function, Opts}] -> - gen_iq_handler:handle(Host, Module, Function, Opts, - From, To, exmpp_iq:xmlel_to_iq(Packet)); - [] -> - Res = exmpp_iq:error(Packet, 'feature-not-implemented'), - ejabberd_router:route(To, From, Res) - end, - {false, Attrs, StateData}; _ -> case privacy_check_packet(StateData, From, To, Packet, in) of allow ->