diff options
| author | Andreas Köhler <andreas.koehler@1und1.de> | 2010-11-05 05:54:56 +0300 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-11-10 17:41:07 +0300 |
| commit | 860d8525ee474a1994ed08c149a0e2ac3f7f6953 (patch) | |
| tree | 30f99b8b8428f430908f38b03f3cf23de2768fb0 /src/ejabberd_c2s.erl | |
| parent | 351635d0aaf7cdcf8337486b77dc5a7b64223bef (diff) | |
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.
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 13 |
1 files changed, 0 insertions, 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 -> |