aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_odbc.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_odbc.erl')
-rw-r--r--src/ejabberd_odbc.erl18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl
index f756fdeb1..e98665862 100644
--- a/src/ejabberd_odbc.erl
+++ b/src/ejabberd_odbc.erl
@@ -898,8 +898,7 @@ db_opts(Host) ->
<<"">>),
case Type of
mssql ->
- Username = get_mssql_user(Server, User),
- [odbc, <<"DSN=", Host/binary, ";UID=", Username/binary,
+ [odbc, <<"DSN=", Host/binary, ";UID=", User/binary,
";PWD=", Pass/binary>>];
_ ->
[Type, Server, Port, DB, User, Pass]
@@ -959,21 +958,6 @@ init_mssql(Host) ->
Err
end.
-get_mssql_user(Server, User) ->
- HostName = case inet_parse:address(binary_to_list(Server)) of
- {ok, _} ->
- Server;
- {error, _} ->
- hd(str:tokens(Server, <<".">>))
- end,
- UserName = case str:chr(User, $@) of
- 0 ->
- <<User/binary, $@, HostName/binary>>;
- _ ->
- User
- end,
- UserName.
-
tmp_dir() ->
filename:join(["/tmp", "ejabberd"]).