From 6740b1f0e1e96fb7ee04fd4046c180c35c9f370d Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 2 Sep 2015 16:02:46 +0300
Subject: [PATCH] Rename idna.erl to ejabberd_idna.erl (#702)

---
 src/{idna.erl => ejabberd_idna.erl} | 4 ++--
 src/ejabberd_s2s.erl                | 4 ++--
 src/ejabberd_s2s_out.erl            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{idna.erl => ejabberd_idna.erl} (99%)

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 dd19ad988..bee3f87ed 100644
--- 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 e1c9ab9da..ef17fc89f 100644
--- 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 77e159cdc..65a60c402 100644
--- 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)