Do not auto append IP suffix to usernames (#1008)

diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl
index f756fdeb1ecbe83b74affa76d9261c93bd464b1c..e98665862b9e16726ce670ba8c0b4dc973e5f19a 100644 (file)
--- 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"]).