diff --git a/ChangeLog b/ChangeLog
index 65117c9a3..fdda29f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-07  Wsourdeau Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
+	-LDAPCheckLogin:_loginpassword:_pwd]): new method to authenticate
+	the user through LDAP.
+
 2006-07-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* The toolbar code from the MailerUI product was taken, renamed as
diff --git a/SoObjects/SOGo/SOGoAuthenticator.h b/SoObjects/SOGo/SOGoAuthenticator.h
index f49e7c562..b1fed7791 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.h
+++ b/SoObjects/SOGo/SOGoAuthenticator.h
@@ -31,12 +31,22 @@
   the password is already checked in Apache.
 */
 
+@class NSUserDefaults;
+@class NSString;
+
 @interface SOGoAuthenticator : SoHTTPAuthenticator
 {
+  NSUserDefaults *ud;
+  NSString *authMethod;
+  NSString *LDAPBaseDN;
+  NSString *LDAPHost;
+  int LDAPPort;
 }
 
 + (id)sharedSOGoAuthenticator;
 
+- (BOOL) LDAPCheckLogin: (NSString *) _login password: (NSString *) _pwd;
+
 @end
 
 #endif /* __Main_SOGoAuthenticator_H__ */
diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m
index bb1b7a2a9..1c2d9073d 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoAuthenticator.m
@@ -19,41 +19,95 @@
   02111-1307, USA.
 */
 
+#import <NGLdap/NGLdapConnection.h>
+
 #include "SOGoAuthenticator.h"
 #include "SOGoUser.h"
 #include "common.h"
 
 @implementation SOGoAuthenticator
 
-static SOGoAuthenticator *auth = nil; // THREAD
+static SOGoAuthenticator *auth = nil;
 
-+ (id)sharedSOGoAuthenticator {
++ (id) sharedSOGoAuthenticator
+{
   if (auth == nil)
     auth = [[self alloc] init];
   return auth;
 }
 
-/* check credentials */
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      ud = [NSUserDefaults standardUserDefaults];
 
-- (BOOL)checkLogin:(NSString *)_login password:(NSString *)_pwd {
-  if ([_login length] == 0)
-    return NO;
-  
-  /* we accept any password since it is checked by Apache in front */
-  return YES;
+      LDAPBaseDN = nil;
+      LDAPHost = nil;
+      LDAPPort = -1;
+
+      authMethod = [[ud stringForKey:@"AuthentificationMethod"] retain];
+      if ([authMethod isEqualToString: @"LDAP"])
+	{
+	  LDAPBaseDN = [[ud stringForKey:@"LDAPRootDN"] retain];
+	  LDAPHost = [[ud stringForKey:@"LDAPHost"] retain];
+	  LDAPPort = [ud integerForKey:@"LDAPPort"];
+	}
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  if (LDAPBaseDN)
+    [LDAPBaseDN release];
+  if (LDAPHost)
+    [LDAPHost release];
+  [authMethod release];
+  [super dealloc];
+}
+
+- (BOOL) checkLogin: (NSString *) _login
+	   password: (NSString *) _pwd
+{
+  BOOL result;
+
+  if ([authMethod isEqualToString: @"LDAP"])
+    result = [self LDAPCheckLogin: _login password: _pwd];
+  else
+    {
+      if ([_login length] == 0)
+	result = NO;
+      else
+	result = YES;
+    }
+
+  return result;
+}
+
+- (BOOL) LDAPCheckLogin: (NSString *) _login
+	       password: (NSString *) _pwd
+{
+  return [NGLdapConnection checkPassword: _pwd
+			   ofLogin: _login
+			   atBaseDN: LDAPBaseDN
+			   onHost: LDAPHost
+			   port: LDAPPort];
 }
 
 /* create SOGoUser */
 
-- (SoUser *)userInContext:(WOContext *)_ctx {
+- (SoUser *)userInContext:(WOContext *)_ctx
+{
   static SoUser *anonymous = nil;
   NSString  *login;
   NSArray   *uroles;
   
-  if (anonymous == nil) {
-    NSArray *ar = [NSArray arrayWithObject:SoRole_Anonymous];
-    anonymous = [[SOGoUser alloc] initWithLogin:@"anonymous" roles:ar];
-  }
+  if (!anonymous)
+    anonymous
+      = [[SOGoUser alloc] initWithLogin:@"anonymous"
+			  roles: [NSArray arrayWithObject: SoRole_Anonymous]];
   
   if ((login = [self checkCredentialsInContext:_ctx]) == nil)
     /* some error (otherwise result would have been anonymous */
@@ -61,9 +115,12 @@ static SOGoAuthenticator *auth = nil; // THREAD
   
   if ([login isEqualToString:@"anonymous"])
     return anonymous;
-  
+
   uroles = [self rolesForLogin:login];
-  return [[[SOGoUser alloc] initWithLogin:login roles:uroles] autorelease];
+
+  return [[[SOGoUser alloc] initWithLogin:login
+			    roles:uroles]
+	   autorelease];
 }
 
 @end /* SOGoAuthenticator */