From 4a9892fa156efec0c0c9143e2a5450132d4c8174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <js.pedron@meetic-corp.com>
Date: Fri, 10 Oct 2008 15:24:47 +0000
Subject: [PATCH] Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and
 change the error handling.

PR:		EJABP-1

SVN Revision: 1628
---
 ChangeLog              |  5 +++--
 src/ejabberd_rdbms.erl | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b0339c16..3878b0a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,9 @@
 
 	* src/ejabberd_s2s_in.erl (wait_for_feature_request/2),
 	src/ejabberd_router.erl (register_route/2, unregister_route/1),
-	src/ejabberd_ctl.erl (process/1): Replace jlib:nameprep/1 by
-	exmpp_stringprep:nameprep/1 and change the error handling.
+	src/ejabberd_ctl.erl (process/1), src/ejabberd_rdbms.erl
+	(needs_odbc/1): Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1
+	and change the error handling.
 
 	* src/ejabberd_config.erl (normalize_hosts/2): Replace jlib:nodeprep/1
 	by exmpp_stringprep:nodeprep/1 and change the error handling.
diff --git a/src/ejabberd_rdbms.erl b/src/ejabberd_rdbms.erl
index fcbe16cbb..d57a1ad54 100644
--- a/src/ejabberd_rdbms.erl
+++ b/src/ejabberd_rdbms.erl
@@ -70,9 +70,14 @@ start_odbc(Host) ->
 
 %% Returns true if we have configured odbc_server for the given host
 needs_odbc(Host) ->
-    LHost = jlib:nameprep(Host),
-    case ejabberd_config:get_local_option({odbc_server, LHost}) of
-	undefined ->
-	    false;
-	_ -> true
+    try
+	LHost = exmpp_stringprep:nameprep(Host),
+	case ejabberd_config:get_local_option({odbc_server, LHost}) of
+	    undefined ->
+		false;
+	    _ -> true
+	end
+    catch
+	_ ->
+	    false
     end.