From 3d7090f62cd2d1506483807bc0e327beda47f0a3 Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Sat, 17 Mar 2007 22:53:42 +0000 Subject: [PATCH] * src/ejabberd_s2s.erl: Fixed spelling SVN Revision: 746 --- ChangeLog | 6 ++++-- src/ejabberd_s2s.erl | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69754d4ba..3ec2c36ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-03-18 Alexey Shchepin + * src/ejabberd_s2s.erl: Fixed spelling + * src/ejabberd_s2s.erl: Don't start s2s process for existing connection in case of race condition @@ -23,9 +25,9 @@ * src/configure.ac: autoconf improvements (thanks to Tony Finch) (EJAB-204). * src/aclocal.m4: Likewise. - + * src/odbc/ejabberd_odbc.erl: ejabberd admin can now choose the - relational database port to user from ejabberd configuration file + relational database port to use from ejabberd configuration file (EJAB-195). * src/doc/guide.tex: Likewise. diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index 100e8a8d2..7800724e5 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -269,17 +269,17 @@ is_service(From, To) -> false; _ -> LDstDomain = To#jid.lserver, - P = fun(Domain) -> is_subdmomain(LDstDomain, Domain) end, + P = fun(Domain) -> is_subdomain(LDstDomain, Domain) end, lists:any(P, ?MYHOSTS) end. %%-------------------------------------------------------------------- -%% Function: is_subdmomain(Domain1, Domain2) -> true | false +%% Function: is_subdomain(Domain1, Domain2) -> true | false %% Description: Return true if Domain1 (a string representing an %% internet domain name) is a subdomain (or the same domain) of %% Domain2 %% -------------------------------------------------------------------- -is_subdmomain(Domain1, Domain2) -> +is_subdomain(Domain1, Domain2) -> lists:suffix(string:tokens(Domain2, "."), string:tokens(Domain1, ".")). send_element(Pid, El) ->