diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index 4ebf68072..b33cb4a28 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -3673,6 +3673,48 @@ void handle_eas_terminate(int signum) } } + if ([(id)[[(id)[theDocumentElement getElementsByTagName: @"UserInformation"] lastObject] getElementsByTagName: @"Get"] lastObject]) + { + NSArray *identities; + int i; + + identities = [[context activeUser] allIdentities]; + + [s appendString: @""]; + [s appendString: @""]; + + if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 14.1) + { + [s appendString: @""]; + [s appendString: @""]; + [s appendFormat: @"%@", [[[identities objectAtIndex: 0] objectForKey: @"fullName"] activeSyncRepresentationInContext: context] ]; + } + + [s appendString: @""]; + + if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 14.1) + [s appendFormat: @"%@", [[[identities objectAtIndex: 0] objectForKey: @"email"] activeSyncRepresentationInContext: context] ]; + else + [s appendFormat: @"%@", [[[identities objectAtIndex: 0] objectForKey: @"email"] activeSyncRepresentationInContext: context] ]; + + if ([identities count] > 1) + { + for (i = 1; i < [identities count]; i++) + [s appendFormat: @"%@", [[[identities objectAtIndex: i] objectForKey: @"email"] activeSyncRepresentationInContext: context] ]; + } + + [s appendString: @""]; + + if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 14.1) + { + [s appendString: @""]; + [s appendString: @""]; + } + + [s appendString: @""]; + [s appendString: @""]; + } + [s appendString: @""]; d = [[s dataUsingEncoding: NSUTF8StringEncoding] xml2wbxml]; diff --git a/NEWS b/NEWS index 6978113ae..8eb476d09 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,7 @@ Bug fixes - [eas] fix search on for Outlook application (#4605 and #4607) - [eas] improve search operations and results fetching - [eas] better handle bogus DTStart values + - [eas] support for basic UserInformation queries (#4614) 4.0.4 (2018-10-23) ------------------