diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-05-08 10:02:27 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-05-08 10:02:27 +0400 |
| commit | 115da545570a1d8822b7b6ca82797c9e8449cb7f (patch) | |
| tree | d2bd9b0162fee108248f5099825d4815e8732660 | |
| parent | Merge pull request #180 from hamano/mysql_table (diff) | |
| parent | improve error handling when sql calling with (empty|unknown) host. (diff) | |
Merge pull request #203 from hamano/added_get_random_pid_error_handling
improve error handling when sql calling with (empty|unknown) host.
| -rw-r--r-- | src/ejabberd_auth.erl | 3 | ||||
| -rw-r--r-- | src/ejabberd_auth_odbc.erl | 1 | ||||
| -rw-r--r-- | src/ejabberd_odbc.erl | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index bf399af2..477926f6 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -300,6 +300,9 @@ get_password_with_authmodule(User, Server) -> -spec is_user_exists(binary(), binary()) -> boolean(). +is_user_exists(User, <<"">>) -> + false; + is_user_exists(User, Server) -> %% Check if the user exists in all authentications module except the module %% passed as parameter diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl index 27e89aa2..57cef930 100644 --- a/src/ejabberd_auth_odbc.erl +++ b/src/ejabberd_auth_odbc.erl @@ -212,7 +212,6 @@ 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 df9a4c39..2b852bfa 100644 --- 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 -> {error, unknownhost}; + none -> {error, <<"Unknown Host">>}; Pid -> (?GEN_FSM):sync_send_event(Pid,{sql_cmd, Msg, now()}, ?TRANSACTION_TIMEOUT) |