From ca8383ebb2c9fa2cf7228ad7a56720fbe1f26dad Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 26 Jan 2005 17:47:21 +0000 Subject: [PATCH] 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 --- SOGoLogic/AgenorUserManager.m | 4 ++-- SOGoLogic/ChangeLog | 6 ++++++ SOGoLogic/Version | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SOGoLogic/AgenorUserManager.m b/SOGoLogic/AgenorUserManager.m index 52fa284c..f44dfdea 100644 --- 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 eac4081d..39f8d67e 100644 --- a/SOGoLogic/ChangeLog +++ b/SOGoLogic/ChangeLog @@ -1,3 +1,9 @@ +2005-01-26 Marcus Mueller + + * 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 * AgenorUserManager.m: changed -getEmailForUID: to resemble the same diff --git a/SOGoLogic/Version b/SOGoLogic/Version index b46f412c..338506ab 100644 --- 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 -- 2.39.5