slight change requested by maxime

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@495 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGoLogic/AgenorUserManager.m b/SOGoLogic/AgenorUserManager.m
index 81563a2f83986caa8be009c31256d06cd6227b43..52fa284c2d6400a6cb69d31b4891fd66a2aecef7 100644 (file)
--- a/SOGoLogic/AgenorUserManager.m
+++ b/SOGoLogic/AgenorUserManager.m
@@ -264,6 +264,7 @@ static NSString *ldapBaseDN = nil;
       
       email = nil;
       count = [emailAttr count];
+#if 0
       if (count > 1) {
         unsigned i;
 
@@ -279,6 +280,7 @@ static NSString *ldapBaseDN = nil;
           }
         }
       }
+#endif
       if (email == nil && count > 0) {
         email = [emailAttr stringValueAtIndex:0];
       }

diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog
index aee920703992b0dabafa61f211adec536f440ec2..eac4081d8228afec21e4222e3af4a7492c47ddf6 100644 (file)
--- a/SOGoLogic/ChangeLog
+++ b/SOGoLogic/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-25  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * AgenorUserManager.m: changed -getEmailForUID: to resemble the same
+         algorithm as used by Anais (v0.9.35)
+
 2005-01-24  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * AgenorUserManager.[hm]: rewrote -getUIDForEmail: and -getEmailForUID:

diff --git a/SOGoLogic/Version b/SOGoLogic/Version
index 2f55a6e4eb52d11da7ce9a03f5bcaa1ee2bed7af..b46f412cfb8379942418d2796a5ce407be7a2c03 100644 (file)
--- a/SOGoLogic/Version
+++ b/SOGoLogic/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=34
+SUBMINOR_VERSION:=35
 
 # v0.9.34 requires libFoundation v1.0.67
 # v0.9.32 requires NGiCal        v4.5.37