diff --git a/src/acl.erl b/src/acl.erl
index 976d70a84..08061ab67 100644
--- a/src/acl.erl
+++ b/src/acl.erl
@@ -232,7 +232,7 @@ match_acl(ACLName, JID, Host) ->
none -> false;
_ ->
User = exmpp_jid:lnode_as_list(JID),
- Server = exmpp_jid:ldomain_as_list(JID),
+ Server = exmpp_jid:prep_domain_as_list(JID),
Resource = exmpp_jid:lresource_as_list(JID),
lists:any(fun(#acl{aclspec = Spec}) ->
case Spec of
diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl
index 5f60932b7..696a55970 100644
--- a/src/ejabberd_router.erl
+++ b/src/ejabberd_router.erl
@@ -352,7 +352,7 @@ do_route(OrigFrom, OrigTo, OrigPacket) ->
drop
end;
Rs ->
- LDstDomain = exmpp_jid:ldomain_as_list(To),
+ LDstDomain = exmpp_jid:prep_domain_as_list(To),
Value = case ejabberd_config:get_local_option(
{domain_balancing, LDstDomain}) of
undefined -> now();
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index c13d8beaa..33af46f76 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -303,8 +303,8 @@ do_route(From, To, Packet) ->
end.
find_connection(From, To) ->
- MyServer = exmpp_jid:ldomain_as_list(From),
- Server = exmpp_jid:ldomain_as_list(To),
+ MyServer = exmpp_jid:prep_domain_as_list(From),
+ Server = exmpp_jid:prep_domain_as_list(To),
FromTo = {MyServer, Server},
MaxS2SConnectionsNumber = max_s2s_connections_number(FromTo),
MaxS2SConnectionsNumberPerNode =
@@ -432,12 +432,12 @@ needed_connections_number(Ls, MaxS2SConnectionsNumber,
%% service.
%% --------------------------------------------------------------------
is_service(From, To) ->
- LFromDomain = exmpp_jid:ldomain_as_list(From),
+ LFromDomain = exmpp_jid:prep_domain_as_list(From),
case ejabberd_config:get_local_option({route_subdomains, LFromDomain}) of
s2s -> % bypass RFC 3920 10.3
false;
_ ->
- LDstDomain = exmpp_jid:ldomain_as_list(To),
+ LDstDomain = exmpp_jid:prep_domain_as_list(To),
P = fun(Domain) -> is_subdomain(LDstDomain, Domain) end,
lists:any(P, ?MYHOSTS)
end.
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 82eab82ce..f1e3bff37 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -390,8 +390,8 @@ stream_established({xmlstreamelement, El}, StateData) ->
% This is handled by C2S and S2S send_element functions.
if
(To /= error) and (From /= error) ->
- LFrom = exmpp_jid:ldomain_as_list(From),
- LTo = exmpp_jid:ldomain_as_list(To),
+ LFrom = exmpp_jid:prep_domain_as_list(From),
+ LTo = exmpp_jid:prep_domain_as_list(To),
if
StateData#state.authenticated ->
case (LFrom == StateData#state.auth_domain)
@@ -643,7 +643,7 @@ get_cert_domains(Cert) ->
D /= error ->
JID = exmpp_jid:parse(D),
case {exmpp_jid:lnode_as_list(JID),
- exmpp_jid:ldomain_as_list(JID),
+ exmpp_jid:prep_domain_as_list(JID),
exmpp_jid:lresource_as_list(JID)} of
{undefined, LD, undefined} ->
[LD];
@@ -679,7 +679,7 @@ get_cert_domains(Cert) ->
{ok, D} when is_binary(D) ->
JID2 = exmpp_jid:parse(binary_to_list(D)),
case {exmpp_jid:lnode_as_list(JID2),
- exmpp_jid:ldomain_as_list(JID2),
+ exmpp_jid:prep_domain_as_list(JID2),
exmpp_jid:lresource_as_list(JID2)} of
{ undefined, LD, undefined} ->
case idna:domain_utf8_to_ascii(LD) of
@@ -697,7 +697,7 @@ get_cert_domains(Cert) ->
({dNSName, D}) when is_list(D) ->
JID3 = exmpp_jid:parse(D),
case {exmpp_jid:lnode_as_list(JID3),
- exmpp_jid:ldomain_as_list(JID3),
+ exmpp_jid:prep_domain_as_list(JID3),
exmpp_jid:lresource_as_list(JID3)} of
{undefined, LD, undefined} ->
[LD];
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index b3b301887..eb71b2416 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -576,7 +576,7 @@ route_message(From, To, Packet) ->
bounce_offline_message(From, To, Packet);
_ ->
case ejabberd_auth:is_user_exists(exmpp_jid:lnode_as_list(To),
- exmpp_jid:ldomain_as_list(To)) of
+ exmpp_jid:prep_domain_as_list(To)) of
true ->
ejabberd_hooks:run(offline_message_hook,
exmpp_jid:prep_domain(To),
@@ -678,7 +678,7 @@ check_max_sessions(JID) ->
%% Defaults to infinity
get_max_user_sessions(JID) ->
case acl:match_rule(
- exmpp_jid:ldomain_as_list(JID), max_user_sessions, exmpp_jid:bare(JID)) of
+ exmpp_jid:prep_domain_as_list(JID), max_user_sessions, exmpp_jid:bare(JID)) of
Max when is_integer(Max) -> Max;
infinity -> infinity;
_ -> ?MAX_USER_SESSIONS
diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl
index ab169d1b9..d71f5b2d9 100644
--- a/src/mod_adhoc.erl
+++ b/src/mod_adhoc.erl
@@ -83,7 +83,7 @@ stop(Host) ->
get_local_commands(Acc, _From, To, <<>>, Lang) ->
Server = exmpp_jid:domain(To),
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
Display = gen_mod:get_module_opt(LServer, ?MODULE, report_commands_node, false),
case Display of
false ->
@@ -114,7 +114,7 @@ get_local_commands(Acc, _From, _To, _Node, _Lang) ->
%-------------------------------------------------------------------------
get_sm_commands(Acc, _From, To, <<>>, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
Display = gen_mod:get_module_opt(LServer, ?MODULE, report_commands_node, false),
case Display of
false ->
diff --git a/src/mod_announce.erl b/src/mod_announce.erl
index bdf702d39..0b0d649fb 100644
--- a/src/mod_announce.erl
+++ b/src/mod_announce.erl
@@ -136,7 +136,7 @@ announce(From, To, Packet) ->
case {exmpp_jid:lnode(To), exmpp_jid:lresource(To)} of
{undefined, Res} ->
Name = Packet#xmlel.name,
- Proc = gen_mod:get_module_proc(exmpp_jid:ldomain_as_list(To), ?PROCNAME),
+ Proc = gen_mod:get_module_proc(exmpp_jid:prep_domain_as_list(To), ?PROCNAME),
case {Res, Name} of
{<<"announce/all">>, 'message'} ->
Proc ! {announce_all, From, To, Packet},
@@ -221,7 +221,7 @@ disco_identity(Acc, _From, _To, Node, Lang) ->
end).
disco_features(Acc, From, To, <<"announce">>, _Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -238,7 +238,7 @@ disco_features(Acc, From, To, <<"announce">>, _Lang) ->
end;
disco_features(Acc, From, To, Node, _Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -290,7 +290,7 @@ disco_features(Acc, From, To, Node, _Lang) ->
end).
disco_items(Acc, From, To, <<>>, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
Server = exmpp_jid:domain(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
@@ -314,7 +314,7 @@ disco_items(Acc, From, To, <<>>, Lang) ->
end;
disco_items(Acc, From, To, <<"announce">>, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -323,7 +323,7 @@ disco_items(Acc, From, To, <<"announce">>, Lang) ->
end;
disco_items(Acc, From, To, Node, _Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -361,7 +361,7 @@ disco_items(Acc, From, To, Node, _Lang) ->
%%-------------------------------------------------------------------------
announce_items(Acc, From, To, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
Server = exmpp_jid:domain(To),
Access1 = gen_mod:get_module_opt(LServer, ?MODULE, access, none),
Nodes1 = case acl:match_rule(LServer, Access1, From) of
@@ -408,7 +408,7 @@ commands_result(Allow, From, To, Request) ->
announce_commands(Acc, From, To, #adhoc_request{ node = Node} = Request) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
LNode = tokenize(Node),
F = fun() ->
Access = gen_mod:get_module_opt(global, ?MODULE, access, none),
@@ -463,7 +463,7 @@ announce_commands(From, To,
#adhoc_response{status = canceled});
XData == false, ActionIsExecute ->
%% User requests form
- Elements = generate_adhoc_form(Lang, Node, exmpp_jid:ldomain_as_list(To)),
+ Elements = generate_adhoc_form(Lang, Node, exmpp_jid:prep_domain_as_list(To)),
adhoc:produce_response(
Request,
#adhoc_response{status = executing,
@@ -542,7 +542,7 @@ handle_adhoc_form(From, To,
node = Node,
sessionid = SessionID},
Fields) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
Confirm = case lists:keysearch("confirm", 1, Fields) of
{value, {"confirm", ["true"]}} ->
true;
@@ -664,7 +664,7 @@ get_title(Lang, <>) ->
%%-------------------------------------------------------------------------
announce_all(From, To, Packet) ->
- Host = exmpp_jid:ldomain_as_list(To),
+ Host = exmpp_jid:prep_domain_as_list(To),
Access = gen_mod:get_module_opt(Host, ?MODULE, access, none),
case acl:match_rule(Host, Access, From) of
deny ->
@@ -695,7 +695,7 @@ announce_all_hosts_all(From, To, Packet) ->
end.
announce_online(From, To, Packet) ->
- Host = exmpp_jid:ldomain_as_list(To),
+ Host = exmpp_jid:prep_domain_as_list(To),
Access = gen_mod:get_module_opt(Host, ?MODULE, access, none),
case acl:match_rule(Host, Access, From) of
deny ->
@@ -728,7 +728,7 @@ announce_online1(Sessions, Server, Packet) ->
end, Sessions).
announce_motd(From, To, Packet) ->
- Host = exmpp_jid:ldomain_as_list(To),
+ Host = exmpp_jid:prep_domain_as_list(To),
Access = gen_mod:get_module_opt(Host, ?MODULE, access, none),
case acl:match_rule(Host, Access, From) of
deny ->
@@ -762,7 +762,7 @@ announce_motd(Host, Packet) ->
mnesia:transaction(F).
announce_motd_update(From, To, Packet) ->
- Host = exmpp_jid:ldomain_as_list(To),
+ Host = exmpp_jid:prep_domain_as_list(To),
Access = gen_mod:get_module_opt(Host, ?MODULE, access, none),
case acl:match_rule(Host, Access, From) of
deny ->
@@ -791,7 +791,7 @@ announce_motd_update(LServer, Packet) ->
mnesia:transaction(F).
announce_motd_delete(From, To, Packet) ->
- Host = exmpp_jid:ldomain_as_list(To),
+ Host = exmpp_jid:prep_domain_as_list(To),
Access = gen_mod:get_module_opt(Host, ?MODULE, access, none),
case acl:match_rule(Host, Access, From) of
deny ->
@@ -828,7 +828,7 @@ announce_motd_delete(LServer) ->
mnesia:transaction(F).
send_motd(JID) ->
- LServer = exmpp_jid:ldomain_as_list(JID),
+ LServer = exmpp_jid:prep_domain_as_list(JID),
LUser = exmpp_jid:lnode_as_list(JID),
case catch mnesia:dirty_read({motd, LServer}) of
[#motd{packet = Packet}] ->
diff --git a/src/mod_caps.erl b/src/mod_caps.erl
index 67bc804ef..576f1f21e 100644
--- a/src/mod_caps.erl
+++ b/src/mod_caps.erl
@@ -218,7 +218,7 @@ receive_packet(From, To, Packet) when ?IS_PRESENCE(Packet) ->
%% anymore until he login again.
%% This is tracked in EJAB-943
_ ->
- ServerString = exmpp_jid:ldomain_as_list(To),
+ ServerString = exmpp_jid:prep_domain_as_list(To),
Els = Packet#xmlel.children,
note_caps(ServerString, From, read_caps(Els))
end;
@@ -229,7 +229,7 @@ receive_packet(_JID, From, To, Packet) ->
receive_packet(From, To, Packet).
presence_probe(From, To, _) ->
- ServerString = exmpp_jid:ldomain_as_list(To),
+ ServerString = exmpp_jid:prep_domain_as_list(To),
wait_caps(ServerString, From).
remove_connection(_SID, JID, _Info) ->
@@ -424,7 +424,7 @@ handle_cast(visit_feature_queries, #state{feature_queries = FeatureQueries} = St
{noreply, State#state{feature_queries = NewFeatureQueries}}.
handle_disco_response(From, To, IQ_Rec) ->
- Host = exmpp_jid:ldomain_as_list(To),
+ Host = exmpp_jid:prep_domain_as_list(To),
Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
gen_server:cast(Proc, {disco_response, From, To, IQ_Rec}).
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 83cb1df83..18841b916 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -184,7 +184,7 @@ get_local_identity(Acc, _From, _To, Node, Lang) ->
end).
get_sm_features(Acc, From, To, Node, _Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -199,7 +199,7 @@ get_sm_features(Acc, From, To, Node, _Lang) ->
end.
get_local_features(Acc, From, To, Node, _Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -255,7 +255,7 @@ get_local_features(Acc, From, To, Node, _Lang) ->
%%%-----------------------------------------------------------------------
adhoc_sm_items(Acc, From, To, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case acl:match_rule(LServer, configure, From) of
allow ->
Items = case Acc of
@@ -274,7 +274,7 @@ adhoc_sm_items(Acc, From, To, Lang) ->
%%%-----------------------------------------------------------------------
get_sm_items(Acc, From, To, Node, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -312,7 +312,7 @@ get_user_resources(BareJID) ->
%%%-----------------------------------------------------------------------
adhoc_local_items(Acc, From, To, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case acl:match_rule(LServer, configure, From) of
allow ->
Items = case Acc of
@@ -391,7 +391,7 @@ get_permission_level(JID) ->
end).
get_local_items(Acc, From, To, <<>>, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -417,7 +417,7 @@ get_local_items(Acc, From, To, <<>>, Lang) ->
end;
get_local_items(Acc, From, To, Node, Lang) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -744,7 +744,7 @@ get_stopped_nodes(_Lang) ->
end).
adhoc_local_commands(Acc, From, To, #adhoc_request{node = Node} = Request) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
LNode = tokenize(Node),
case LNode of
["running nodes", _ENode, "DB"] ->
@@ -773,7 +773,7 @@ adhoc_local_commands(From, To,
sessionid = SessionID,
action = Action,
xdata = XData} = Request) ->
- LServer = exmpp_jid:ldomain_as_list(To),
+ LServer = exmpp_jid:prep_domain_as_list(To),
LNode = tokenize(Node),
%% If the "action" attribute is not present, it is
%% understood as "execute". If there was no
default allowed nodes: /home/host/user/any/node/name
create_node(Host, Node, _Type, Owner, _Options) -> UserName = exmpp_jid:lnode_as_list(Owner), - UserHost = exmpp_jid:ldomain_as_list(Owner), + UserHost = exmpp_jid:prep_domain_as_list(Owner), case Node of ["home", UserHost, UserName | _] -> {error, {virtual, {Host, Node}}}; _ -> {error, 'not-allowed'} diff --git a/src/mod_register.erl b/src/mod_register.erl index 3b6ce57cd..a84e8f184 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -88,7 +88,7 @@ unauthenticated_iq_register(Acc, _Server, _IQ, _IP) -> process_iq(From, To, IQ) -> process_iq(From, To, IQ, {exmpp_jid:lnode_as_list(From), - exmpp_jid:ldomain_as_list(From), + exmpp_jid:prep_domain_as_list(From), exmpp_jid:lresource_as_list(From)}). process_iq(From, To, @@ -99,11 +99,11 @@ process_iq(From, To, UTag = exmpp_xml:get_element(SubEl, 'username'), PTag = exmpp_xml:get_element(SubEl, 'password'), RTag = exmpp_xml:get_element(SubEl, 'remove'), - Server = exmpp_jid:ldomain_as_list(To), + Server = exmpp_jid:prep_domain_as_list(To), if (UTag /= undefined) and (RTag /= undefined) -> User = exmpp_xml:get_cdata_as_list(UTag), - case {exmpp_jid:node_as_list(From), exmpp_jid:ldomain_as_list(From)} of + case {exmpp_jid:node_as_list(From), exmpp_jid:prep_domain_as_list(From)} of {User, Server} -> ejabberd_auth:remove_user(User, Server), exmpp_iq:result(IQ_Rec, SubEl); @@ -138,7 +138,7 @@ process_iq(From, To, end; (UTag == undefined) and (RTag /= undefined) -> case {exmpp_jid:node_as_list(From), - exmpp_jid:ldomain_as_list(From), + exmpp_jid:prep_domain_as_list(From), exmpp_jid:resource_as_list(From)}of {User, Server, Resource} -> ResIQ = exmpp_iq:result(IQ_Rec, SubEl), @@ -158,7 +158,7 @@ process_iq(From, To, (UTag /= undefined) and (PTag /= undefined) -> User = exmpp_xml:get_cdata_as_list(UTag), Password = exmpp_xml:get_cdata_as_list(PTag), - case {exmpp_jid:node_as_list(From), exmpp_jid:ldomain_as_list(From)} of + case {exmpp_jid:node_as_list(From), exmpp_jid:prep_domain_as_list(From)} of {User, Server} -> try_set_password(User, Server, Password, IQ_Rec, SubEl); _ -> @@ -241,7 +241,7 @@ try_register(User, Server, Password, Source, Lang) -> send_welcome_message(JID) -> - Host = exmpp_jid:ldomain_as_list(JID), + Host = exmpp_jid:prep_domain_as_list(JID), case gen_mod:get_module_opt(Host, ?MODULE, welcome_message, {"", ""}) of {"", ""} -> ok; @@ -255,7 +255,7 @@ send_welcome_message(JID) -> end. send_registration_notifications(UJID) -> - Host = exmpp_jid:ldomain_as_list(UJID), + Host = exmpp_jid:prep_domain_as_list(UJID), case gen_mod:get_module_opt(Host, ?MODULE, registration_watchers, []) of [] -> ok; JIDs when is_list(JIDs) -> diff --git a/src/mod_roster.erl b/src/mod_roster.erl index a817bbad9..1b227ba7c 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -135,7 +135,7 @@ stop(Host) when is_list(Host) -> process_iq(From, To, IQ_Rec) when ?IS_JID(From), ?IS_JID(To), ?IS_IQ_RECORD(IQ_Rec) -> - LServer = exmpp_jid:ldomain_as_list(From), + LServer = exmpp_jid:prep_domain_as_list(From), case lists:member(LServer, ?MYHOSTS) of true -> process_local_iq(From, To, IQ_Rec); diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl index 65666206d..408ac1411 100644 --- a/src/mod_roster_odbc.erl +++ b/src/mod_roster_odbc.erl @@ -103,7 +103,7 @@ stop(Host) -> process_iq(From, To, IQ_Rec) -> - LServer = exmpp_jid:ldomain_as_list(From), + LServer = exmpp_jid:prep_domain_as_list(From), case lists:member(LServer, ?MYHOSTS) of true -> process_local_iq(From, To, IQ_Rec); @@ -756,7 +756,7 @@ get_in_pending_subscriptions(Ls, User, Server) when is_binary(User), is_binary(Server) -> JID = exmpp_jid:make(User, Server), LUser = exmpp_jid:lnode(JID), - LServer = exmpp_jid:ldomain_as_list(JID), + LServer = exmpp_jid:prep_domain_as_list(JID), Username = ejabberd_odbc:escape(LUser), case catch odbc_queries:get_roster(LServer, Username) of {selected, ["username", "jid", "nick", "subscription", "ask", diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl index 725f69010..66d2599b9 100644 --- a/src/mod_service_log.erl +++ b/src/mod_service_log.erl @@ -55,10 +55,10 @@ stop(Host) -> ok. log_user_send(From, To, Packet) -> - log_packet(From, To, Packet, exmpp_jid:ldomain_as_list(From)). + log_packet(From, To, Packet, exmpp_jid:prep_domain_as_list(From)). log_user_receive(_JID, From, To, Packet) -> - log_packet(From, To, Packet, exmpp_jid:ldomain_as_list(To)). + log_packet(From, To, Packet, exmpp_jid:prep_domain_as_list(To)). log_packet(From, To, Packet, Host) -> diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 25cdb9a24..aa132cba4 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -941,7 +941,7 @@ shared_roster_group_parse_query(Host, Group, Query) -> _ -> try JID = exmpp_jid:parse(SJID), - [{exmpp_jid:lnode_as_list(JID), exmpp_jid:ldomain_as_list(JID)} | USs] + [{exmpp_jid:lnode_as_list(JID), exmpp_jid:prep_domain_as_list(JID)} | USs] catch _ -> error diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index c98802b80..820cee5f0 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -170,7 +170,7 @@ process_local_iq(_From, _To, #iq{type = set} = IQ_Rec) -> process_sm_iq(_From, To, #iq{type = get} = IQ_Rec) -> LUser = exmpp_jid:lnode_as_list(To), - LServer = exmpp_jid:ldomain_as_list(To), + LServer = exmpp_jid:prep_domain_as_list(To), US = {LUser, LServer}, F = fun() -> mnesia:read({vcard, US}) @@ -191,7 +191,7 @@ process_sm_iq(_From, To, #iq{type = get} = IQ_Rec) -> end; process_sm_iq(From, _To, #iq{type = set, payload = Request} = IQ_Rec) -> User = exmpp_jid:node_as_list(From), - LServer = exmpp_jid:ldomain_as_list(From), + LServer = exmpp_jid:prep_domain_as_list(From), case lists:member(LServer, ?MYHOSTS) of true -> set_vcard(User, LServer, Request), diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl index 148d6b0af..ef746903b 100644 --- a/src/mod_vcard_ldap.erl +++ b/src/mod_vcard_ldap.erl @@ -240,7 +240,7 @@ process_local_iq(_From, _To, #iq{type = set} = IQ_Rec) -> exmpp_iq:error(IQ_Rec, 'not-allowed'). process_sm_iq(_From, To, #iq{} = IQ_Rec) -> - LServer = exmpp_jid:ldomain_as_list(To), + LServer = exmpp_jid:prep_domain_as_list(To), case catch process_vcard_ldap(To, IQ_Rec, LServer) of {'EXIT', _} -> exmpp_iq:error(IQ_Rec, 'internal-server-error'); diff --git a/src/mod_vcard_odbc.erl b/src/mod_vcard_odbc.erl index 45531bd95..f7ca4a9dd 100644 --- a/src/mod_vcard_odbc.erl +++ b/src/mod_vcard_odbc.erl @@ -132,7 +132,7 @@ process_local_iq(_From, _To, #iq{type = set} = IQ_Rec) -> process_sm_iq(_From, To, #iq{type = get} = IQ_Rec) -> LUser = exmpp_jid:lnode_as_list(To), - LServer = exmpp_jid:ldomain_as_list(To), + LServer = exmpp_jid:prep_domain_as_list(To), Username = ejabberd_odbc:escape(LUser), case catch odbc_queries:get_vcard(LServer, Username) of {selected, ["vcard"], [{SVCARD}]} -> @@ -153,7 +153,7 @@ process_sm_iq(_From, To, #iq{type = get} = IQ_Rec) -> end; process_sm_iq(From, _To, #iq{type = set, payload = Request} = IQ_Rec) -> User = exmpp_jid:node_as_list(From), - LServer = exmpp_jid:ldomain_as_list(From), + LServer = exmpp_jid:prep_domain_as_list(From), case lists:member(LServer, ?MYHOSTS) of true -> set_vcard(User, LServer, Request), diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 75f30f2aa..ee5b1d5f1 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -1178,7 +1178,7 @@ string_to_spec("server_regexp", Val) -> string_to_spec("node_regexp", Val) -> JID = exmpp_jid:parse(Val), U = exmpp_jid:lnode_as_list(JID), - S = exmpp_jid:ldomain_as_list(JID), + S = exmpp_jid:prep_domain_as_list(JID), undefined = exmpp_jid:resource(JID), {node_regexp, U, S}; string_to_spec("user_glob", Val) -> @@ -1188,7 +1188,7 @@ string_to_spec("server_glob", Val) -> string_to_spec("node_glob", Val) -> JID = exmpp_jid:parse(Val), U = exmpp_jid:lnode_as_list(JID), - S = exmpp_jid:ldomain_as_list(JID), + S = exmpp_jid:prep_domain_as_list(JID), undefined = exmpp_jid:resource(JID), {node_glob, U, S}; string_to_spec("all", _) -> @@ -1201,7 +1201,7 @@ string_to_spec("raw", Val) -> string_to_spec2(ACLName, Val) -> JID = exmpp_jid:parse(Val), U = exmpp_jid:lnode_as_list(JID), - S = exmpp_jid:ldomain_as_list(JID), + S = exmpp_jid:prep_domain_as_list(JID), undefined = exmpp_jid:resource(JID), case U of undefined ->