diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-03-21 22:06:38 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-03-21 22:06:38 +0100 |
| commit | a5d6044448ad651581db47b33c6991e8ef32eb61 (patch) | |
| tree | ca373c4cbc2e26f30783aa60da4a7a3bdeca8987 /src/ejabberd_auth_odbc.erl | |
| parent | Remove duplicate CREATE INDEX in mysql.sql (diff) | |
Fix compilation on Erlang R15B
Diffstat (limited to 'src/ejabberd_auth_odbc.erl')
| -rw-r--r-- | src/ejabberd_auth_odbc.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl index 2316ef3be..881b86cca 100644 --- a/src/ejabberd_auth_odbc.erl +++ b/src/ejabberd_auth_odbc.erl @@ -83,7 +83,7 @@ check_password(User, Server, Password) -> #scram{storedkey = StoredKey, serverkey = ServerKey, salt = Salt, - iterationcount = binary_to_integer( + iterationcount = jlib:binary_to_integer( IterationCount)}, is_password_scram_valid(Password, Scram); {selected, [<<"password">>, <<"serverkey">>, @@ -168,7 +168,7 @@ set_password(User, Server, Password) -> ejabberd_odbc:escape(Scram#scram.storedkey), ejabberd_odbc:escape(Scram#scram.serverkey), ejabberd_odbc:escape(Scram#scram.salt), - integer_to_binary(Scram#scram.iterationcount) + jlib:integer_to_binary(Scram#scram.iterationcount) ) of {atomic, ok} -> ok; @@ -204,7 +204,7 @@ try_register(User, Server, Password) -> ejabberd_odbc:escape(Scram#scram.storedkey), ejabberd_odbc:escape(Scram#scram.serverkey), ejabberd_odbc:escape(Scram#scram.salt), - integer_to_binary(Scram#scram.iterationcount) + jlib:integer_to_binary(Scram#scram.iterationcount) ) of {updated, 1} -> {atomic, ok}; _ -> {atomic, exists} @@ -278,7 +278,7 @@ get_password(User, Server) -> {jlib:decode_base64(StoredKey), jlib:decode_base64(ServerKey), jlib:decode_base64(Salt), - binary_to_integer(IterationCount)}; + jlib:binary_to_integer(IterationCount)}; _ -> false end; false -> @@ -439,7 +439,7 @@ convert_to_scram(Server) -> case ejabberd_odbc:sql_query_t( [<<"select username, password from users where " "iterationcount=0 limit ">>, - integer_to_binary(?BATCH_SIZE), + jlib:integer_to_binary(?BATCH_SIZE), <<";">>]) of {selected, [<<"username">>, <<"password">>], []} -> ok; @@ -453,7 +453,7 @@ convert_to_scram(Server) -> ejabberd_odbc:escape(Scram#scram.storedkey), ejabberd_odbc:escape(Scram#scram.serverkey), ejabberd_odbc:escape(Scram#scram.salt), - integer_to_binary(Scram#scram.iterationcount) + jlib:integer_to_binary(Scram#scram.iterationcount) ) end, Rs), continue; |