fix error handling when sql calling with unknown host.

diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl
index 57cef930a6b6cf46fd762147f4758040ec0ae7aa..27e89aa2bd09aad738d947fa20fefb478ee07d63 100644 (file)
--- a/src/ejabberd_auth_odbc.erl
+++ b/src/ejabberd_auth_odbc.erl
@@ -212,6 +212,7 @@ is_user_exists(User, Server) ->
                true; %% Account exists
            {selected, [<<"password">>], []} ->
                false; %% Account does not exist
+           {error, unknownhost} -> false;
            {error, Error} -> {error, Error}
          catch
            _:B -> {error, B}

diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl
index 802e32ae274fc03571804cb38572f6d88896e16c..df9a4c39895cb5df03a6be3e24bc392e8c6070c1 100644 (file)
--- a/src/ejabberd_odbc.erl
+++ b/src/ejabberd_odbc.erl
@@ -141,7 +141,7 @@ sql_call(Host, Msg) ->
     case get(?STATE_KEY) of
       undefined ->
         case ejabberd_odbc_sup:get_random_pid(Host) of
-          none -> ?WARNING_MSG("SQL calling unknown host: ~p~n", [Host]);
+          none -> {error, unknownhost};
           Pid ->
             (?GEN_FSM):sync_send_event(Pid,{sql_cmd, Msg, now()},
                                        ?TRANSACTION_TIMEOUT)