propagate from branch 'ca.inverse.sogo.1_3_12' (head c241a8e1e716fa0db3e4f4e370c051096cc2c3e2)

to branch 'ca.inverse.sogo' (head d807738c8f35c5080fb2e1684404fb8d992c8032)

Monotone-Parent: c241a8e1e716fa0db3e4f4e370c051096cc2c3e2
Monotone-Parent: d807738c8f35c5080fb2e1684404fb8d992c8032
Monotone-Revision: 62ee066ad239ea56d6f2dc0b73f12d399813d68c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T21:01:06
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/LDAPSource.h

@@ -30,10 +30,12 @@
 #include "SOGoSource.h"
 #include "SOGoConstants.h"
 
-@class NSDictionary;
-@class NSString;
-@class NGLdapConnection;
+@class LDAPSourceSchema;
 @class NGLdapEntry;
+@class NSException;
+@class NSMutableArray;
+@class NSMutableDictionary;
+@class NSString;
 
 @interface LDAPSource : NSObject <SOGoDNSource>
 {
@@ -41,6 +43,8 @@
   int queryTimeout;
 
   NSString *sourceID;
+  NSString *displayName;
+
   NSString *bindDN;       // The bindDN/password could be either the source's one
   NSString *password;     // or the current user if _bindAsCurrentUser is set to YES
   NSString *sourceBindDN; // while sourceBindDN/sourceBindPassword always belong to the source
@@ -49,20 +53,26 @@
   unsigned int port;
   NSString *encryption;
   NSString *_filter;
+  BOOL _bindAsCurrentUser;
   NSString *_scope;
 
   NSString *baseDN;
+  LDAPSourceSchema *schema;
   NSString *IDField;     // the first part of a user DN
   NSString *CNField;
   NSString *UIDField;
   NSArray *mailFields, *searchFields;
   NSString *IMAPHostField, *IMAPLoginField;
   NSArray *bindFields;
-  BOOL _bindAsCurrentUser;
+
+  BOOL listRequiresDot;
 
   NSString *domain;
   NSString *contactInfoAttribute;
 
+  NSDictionary *contactMapping;
+  NSArray *contactObjectClasses;
+
   NSDictionary *modulesConstraints;
 
   NSMutableArray *searchAttributes;
@@ -76,6 +86,12 @@
   NSString *multipleBookingsField;
 
   NSString *MSExchangeHostname;
+
+  /* user addressbooks */
+  NSString *abOU;
+
+  /* ACL */
+  NSArray *modifiers;
 }
 
 - (void) setBindDN: (NSString *) newBindDN
@@ -97,6 +113,11 @@
 	 kindField: (NSString *) newKindField
 andMultipleBookingsField: (NSString *) newMultipleBookingsField;
 
+/* This enable the convertion of a contact entry with inetOrgPerson and mozillaAbPerson
+   to and from an LDAP record */
+- (void) setContactMapping: (NSDictionary *) newMapping
+          andObjectClasses: (NSArray *) newObjectClasses;
+
 - (NGLdapEntry *) lookupGroupEntryByUID: (NSString *) theUID;
 - (NGLdapEntry *) lookupGroupEntryByEmail: (NSString *) theEmail;
 - (NGLdapEntry *) lookupGroupEntryByAttribute: (NSString *) theAttribute