Rename idna.erl to ejabberd_idna.erl (#702)

diff --git a/src/idna.erl b/src/ejabberd_idna.erl
similarity index 99%
rename from src/idna.erl
rename to src/ejabberd_idna.erl
index dd19ad988fbebdcbdbec8fe232d9d03ca8118b06..bee3f87ed324c03d6a1d0907a3a17edd9d6597fa 100644 (file)
--- a/src/idna.erl
+++ b/src/ejabberd_idna.erl
@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% File    : idna.erl
+%%% File    : ejabberd_idna.erl
 %%% Author  : Alexey Shchepin <alexey@process-one.net>
 %%% Purpose : Support for IDNA (RFC3490)
 %%% Created : 10 Apr 2004 by Alexey Shchepin <alexey@process-one.net>
@@ -23,7 +23,7 @@
 %%%
 %%%----------------------------------------------------------------------
 
--module(idna).
+-module(ejabberd_idna).
 
 -author('alexey@process-one.net').
 

diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index e1c9ab9dab713024485db6767cf442ad85d4aeb1..ef17fc89f6de4e08048193cff2494ae1b19e6a70 100644 (file)
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -225,7 +225,7 @@ check_peer_certificate(SockMod, Sock, Peer) ->
       {ok, Cert} ->
          case SockMod:get_verify_result(Sock) of
            0 ->
-               case idna:domain_utf8_to_ascii(Peer) of
+               case ejabberd_idna:domain_utf8_to_ascii(Peer) of
                  false ->
                      {error, <<"Cannot decode remote server name">>};
                  AsciiPeer ->
@@ -720,7 +720,7 @@ get_cert_domains(Cert) ->
                                                                     lresource =
                                                                         <<"">>} ->
                                                                    case
-                                                                     idna:domain_utf8_to_ascii(LD)
+                                                                     ejabberd_idna:domain_utf8_to_ascii(LD)
                                                                        of
                                                                      false ->
                                                                          [];

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 77e159cdc6c0f3dea9e1c3d903a22f2ec17ed4ed..65a60c40298ad6ef318538a07d3abadefd0e7e48 100644 (file)
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -235,7 +235,7 @@ open_socket(init, StateData) ->
           [{StateData#state.myname, StateData#state.server,
             StateData#state.new, StateData#state.verify}]),
     AddrList = case
-                idna:domain_utf8_to_ascii(StateData#state.server)
+                ejabberd_idna:domain_utf8_to_ascii(StateData#state.server)
                   of
                 false -> [];
                 ASCIIAddr -> get_addr_port(ASCIIAddr)