Monotone-Parent: c80328c7641cc92221810e163f1f30bb47dbbd6e

Monotone-Revision: 32f5ff4c695e7e7d495966f686556dc800e22466

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-04T15:41:14
Monotone-Branch: ca.inverse.sogo

Main/SOGo.m

@@ -41,10 +41,11 @@
 
 #import <WEExtensions/WEResourceManager.h>
 
-#import <SoObjects/SOGo/SOGoAuthenticator.h>
+#import <SoObjects/SOGo/SOGoDAVAuthenticator.h>
+#import <SoObjects/SOGo/SOGoPermissions.h>
 #import <SoObjects/SOGo/SOGoUserFolder.h>
 #import <SoObjects/SOGo/SOGoUser.h>
-#import <SoObjects/SOGo/SOGoPermissions.h>
+#import <SoObjects/SOGo/SOGoWebAuthenticator.h>
 
 #import "build.h"
 #import "SOGoProductLoader.h"
@@ -233,7 +234,16 @@ static BOOL debugObjectAllocation = NO;
 
 - (id) authenticatorInContext: (id) _ctx
 {
-  return [$(@"SOGoAuthenticator") sharedSOGoAuthenticator];
+  id authenticator;
+  NSString *key;
+
+  key = [[_ctx request] requestHandlerKey];
+  if ([key isEqualToString: @"dav"])
+    authenticator = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
+  else
+    authenticator = [SOGoWebAuthenticator sharedSOGoWebAuthenticator];
+
+  return authenticator;
 }
 
 /* name lookup */