From 96d88de564f36e45bf9d82258c1378b881532b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Garc=C3=ADa?= <jjgarcia@zentyal.com>
Date: Tue, 2 Jun 2015 12:24:56 +0200
Subject: [PATCH] Revert "Fixed mess regarding uid/realUID"

This reverts commit 4f303f8aa26046ecae916c457839d84622b260bb.
---
 SoObjects/SOGo/SOGoUser.m | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index c1b0f7603..91d3b1b5a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -197,12 +197,8 @@
           // When the user is associated to a domain, the [SOGoUser login]
           // method returns the combination login@domain while
           // [SOGoUser loginInDomain] only returns the login.
-          r = [realUID rangeOfString: domain  options: NSBackwardsSearch|NSCaseInsensitiveSearch];
-
-          if (r.location != NSNotFound)
-            uid = [realUID substringToIndex: r.location-1];
-          else
-            uid = [NSString stringWithString: realUID];
+          uid = [NSString stringWithString: realUID];
+          realUID = [NSString stringWithFormat: @"%@@%@", realUID, domain];
         }
     }