From 4239a71516fa01d13b2f60681e939cab5c0a75fa Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 6 Feb 2012 13:57:44 +0000 Subject: [PATCH] Monotone-Parent: 95c7a1c7bf37236d7e711c323e1798c779fd1f21 Monotone-Revision: 9885caef81ed03ae9c3c25ac8c9a6c0bf60db18b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-06T13:57:44 --- ChangeLog | 5 +++++ SoObjects/SOGo/LDAPSource.m | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37540a66c..efe52cda0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-06 Wolfgang Sourdeau + + * SoObjects/SOGo/LDAPSource.m: escape built DNs using the new + -[NSString escapedForLDAPDN] method. + 2012-02-03 Francis Lachapelle * UI/WebServerResources/UIxMailEditor.js (onRemoveAttachments): diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 005574437..470aee52f 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -34,6 +34,7 @@ #import #import #import +#import #import "NSArray+Utilities.h" #import "NSString+Utilities.h" @@ -572,7 +573,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField } else userDN = [NSString stringWithFormat: @"%@=%@,%@", - IDField, _login, baseDN]; + IDField, [_login escapedForLDAPDN], baseDN]; } if (userDN) @@ -661,7 +662,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField userDN = [self _fetchUserDNForLogin: login]; else userDN = [NSString stringWithFormat: @"%@=%@,%@", - IDField, login, baseDN]; + IDField, [login escapedForLDAPDN], baseDN]; if (userDN) { NS_DURING