From 57f7b34b90e8d0970b72dd25928263168ef142fc Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Tue, 22 Mar 2016 13:25:34 +0300
Subject: [PATCH] Do not auto append IP suffix to usernames (#1008)

---
 src/ejabberd_odbc.erl | 18 +-----------------
 1 file changed, 1 insertion(+), 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"]).