See ChangeLog

Monotone-Parent: ed15d4f340fd47347d881c8826eb40a2dc22763d
Monotone-Revision: d669b0b3e321e22c68d092f984d543560ae1af0e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T20:01:34

SoObjects/SOGo/LDAPSource.m

@@ -1,6 +1,6 @@
 /* LDAPSource.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2011 Inverse inc.
+ * Copyright (C) 2007-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *         Ludovic Marcotte <lmarcotte@inverse.ca>
@@ -124,6 +124,8 @@ static NSArray *commonSearchFields;
 				    @"serialnumber",
 				    @"calfburl",
                                     @"proxyaddresses",
+                                    // MS Exchange
+                                    @"msExchHomeServerName",
 				    nil];	
       [commonSearchFields retain];
     }
@@ -181,6 +183,8 @@ static NSArray *commonSearchFields;
       kindField = nil;
       multipleBookingsField = nil;
 
+      MSExchangeHostname = nil;
+
       _dnCache = [[NSMutableDictionary alloc] init];
     }
 
@@ -216,6 +220,7 @@ static NSArray *commonSearchFields;
   [_dnCache release];
   [kindField release];
   [multipleBookingsField release];
+  [MSExchangeHostname release];
   [super dealloc];
 }
 
@@ -249,7 +254,7 @@ static NSArray *commonSearchFields;
        IMAPLoginField: [udSource objectForKey: @"IMAPLoginFieldName"]
 	   bindFields: [udSource objectForKey: @"bindFields"]
 	    kindField: [udSource objectForKey: @"KindFieldName"]
-	    andMultipleBookingsField: [udSource objectForKey: @"MultipleBookingsFieldName"]];
+            andMultipleBookingsField: [udSource objectForKey: @"MultipleBookingsFieldName"]];
 
       if ([sourceDomain length])
         {
@@ -286,6 +291,8 @@ static NSArray *commonSearchFields;
 
       if ([udSource objectForKey: @"passwordPolicy"])
 	passwordPolicy = [[udSource objectForKey: @"passwordPolicy"] boolValue];
+
+      ASSIGN(MSExchangeHostname, [udSource objectForKey: @"MSExchangeHostname"]);
     }
   
   return self;
@@ -297,11 +304,21 @@ static NSArray *commonSearchFields;
   ASSIGN(bindDN, theDN);
 }
 
+- (NSString *) bindDN
+{
+  return bindDN;
+}
+
 - (void) setBindPassword: (NSString *) thePassword
 {
   ASSIGN (password, thePassword);
 }
 
+- (NSString *) bindPassword
+{
+  return password;
+}
+
 - (BOOL) bindAsCurrentUser
 {
   return _bindAsCurrentUser;
@@ -888,6 +905,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
   id o;
 
   contactEntry = [NSMutableDictionary dictionary];
+  [contactEntry setObject: self forKey: @"source"];
   [contactEntry setObject: [ldapEntry dn] forKey: @"dn"];
   attributes = [[self _searchAttributes] objectEnumerator];
 
@@ -1225,4 +1243,9 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
   return baseDN;
 }
 
+- (NSString *) MSExchangeHostname
+{
+  return MSExchangeHostname;
+}
+
 @end