From e3c86944718d68806ad42c4d14c964a72da90b44 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 15 Aug 2014 12:35:41 -0400
Subject: 3.0.5340.20849

---
 MediaBrowser.Server.Implementations/Session/SessionManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Session')

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 7db6d01919..d55d26e440 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1211,7 +1211,7 @@ namespace MediaBrowser.Server.Implementations.Session
             bool isLocal)
         {
             var result = (isLocal && string.Equals(request.App, "Dashboard", StringComparison.OrdinalIgnoreCase)) ||
-                await _userManager.AuthenticateUser(request.Username, request.Password).ConfigureAwait(false);
+                await _userManager.AuthenticateUser(request.Username, request.Password, request.RemoteEndPoint).ConfigureAwait(false);
 
             if (!result)
             {
@@ -1234,10 +1234,10 @@ namespace MediaBrowser.Server.Implementations.Session
                 request.RemoteEndPoint,
                 user)
                 .ConfigureAwait(false);
-
+            
             return new AuthenticationResult
             {
-                User = _dtoService.GetUserDto(user),
+                User = _userManager.GetUserDto(user, request.RemoteEndPoint),
                 SessionInfo = GetSessionInfoDto(session),
                 AccessToken = token,
                 ServerId = _appHost.ServerId
-- 
cgit v1.2.3