Last minute change for email lookup, requested & confirmed by Maxime

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

diff --git a/SOGoLogic/AgenorUserManager.m b/SOGoLogic/AgenorUserManager.m
index 52fa284c2d6400a6cb69d31b4891fd66a2aecef7..f44dfdeabf7e7b43008fd3e71a10455d2a69c751 100644 (file)
--- a/SOGoLogic/AgenorUserManager.m
+++ b/SOGoLogic/AgenorUserManager.m
@@ -234,7 +234,7 @@ static NSString *ldapBaseDN = nil;
     NSString         *email;
     
     if(!emailAttrs) {
-      emailAttrs = [[NSArray alloc] initWithObjects:@"mail", nil];
+      emailAttrs = [[NSArray alloc] initWithObjects:@"mineqMelmailEmission", nil];
     }
     
     if((email = [self _cachedEmailForUID:_uid]))
@@ -255,7 +255,7 @@ static NSString *ldapBaseDN = nil;
       }
       return nil;
     }
-    emailAttr = [entry attributeWithName:@"mail"];
+    emailAttr = [entry attributeWithName:@"mineqMelmailEmission"];
     if (!emailAttr) {
       return nil; /* shit happens */
     }

diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog
index eac4081d8228afec21e4222e3af4a7492c47ddf6..39f8d67e4b3adcf5c3e33730ae2abe7ad3ca9aa3 100644 (file)
--- a/SOGoLogic/ChangeLog
+++ b/SOGoLogic/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-26  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * AgenorUserManager.m: changed -getEmailForUID: to use 
+         'mineqMelmailEmission' instead of 'mail' as this is in accordance to
+         the Ministry's specs. (v0.9.36)
+
 2005-01-25  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * AgenorUserManager.m: changed -getEmailForUID: to resemble the same

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