From 8456d4968695cacef614f96da9984b56b487df83 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 1 Dec 2015 11:39:07 -0500
Subject: [PATCH] Revert "(fix) fixed addressbrook-only source entires having a
 c_uid set"

This reverts commit ef7de7c10d6d0b722850347e88fb3d620588a66b.
---
 NEWS                                         |  1 -
 SoObjects/Contacts/SOGoContactSourceFolder.m | 13 ++-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index 190c1da46..ef78060ac 100644
--- a/NEWS
+++ b/NEWS
@@ -58,7 +58,6 @@ Bug fixes
  - fixed wrong comparison of meta vs. META tag in HTML mails
  - fixed popup menu position when moved to the left (#3381)
  - fixed dialog position when at the bottom of the window (#2646, #3378)
- - fixed addressbrook-only source entires having a c_uid set
 
 2.3.2 (2015-09-16)
 ------------------
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index b92b953a1..9e9a19f1c 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -47,7 +47,6 @@
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSource.h>
-#import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/WORequest+SOGo.h>
@@ -226,16 +225,8 @@
   NSObject <SOGoSource> *recordSource;
 
   newRecord = [NSMutableDictionary dictionaryWithCapacity: 8];
-
-  // We set the c_uid only for authentication sources. SOGoUserSources set
-  // with canAuthenticate = NO and isAddressBook = YES have absolutely *NO REASON*
-  // to have entries with a c_uid. These can collide with real uids.
-  if ([[[[SOGoUserManager sharedUserManager] metadataForSourceID: [source sourceID]] objectForKey: @"canAuthenticate"] boolValue])
-    {
-      [newRecord setObject: [oldRecord objectForKey: @"c_uid"]
-                    forKey: @"c_uid"];
-    }
-
+  [newRecord setObject: [oldRecord objectForKey: @"c_uid"]
+                forKey: @"c_uid"];
   [newRecord setObject: [oldRecord objectForKey: @"c_name"]
                 forKey: @"c_name"];