From e71a5a5ebd53c7506dcb07b4263e977d7ba1b677 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 10 Jun 2010 21:32:23 +0000
Subject: [PATCH] Monotone-Parent: 002a7f40ed2519734c4baf4cd4433ecc02b46d54
 Monotone-Revision: ebbadbdb3549dd7264241be0a6c21ab9a481341f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-10T21:32:23
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           | 4 ++++
 SoObjects/SOGo/SOGoSystemDefaults.h | 1 +
 SoObjects/SOGo/SOGoSystemDefaults.m | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b058a15b6..8edb2d266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoSystemDefaults.m (-davAuthenticationType):
+	new method similar to -authenticationType. Currently used for CAS
+	or non-CAS authentication.
+
 	* UI/MainUI/SOGoUserHomePage.m (-logoffAction): split method in
 	smaller submethods for the sake of clarity. Also, we provide as
 	"CAS" mode where the redirection is made to the CAS logout page.
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index db5e63809..cd8e3a834 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -61,6 +61,7 @@
 - (NSString *) loginSuffix;
 
 - (NSString *) authenticationType;
+- (NSString *) davAuthenticationType;
 
 - (NSString *) CASServiceURL;
 - (BOOL) CASLogoutEnabled;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index bc47d6e85..659aff14f 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -291,6 +291,11 @@ BootstrapNSUserDefaults ()
   return [[self stringForKey: @"SOGoAuthenticationType"] lowercaseString];
 }
 
+- (NSString *) davAuthenticationType
+{
+  return [[self stringForKey: @"SOGoDAVAuthenticationType"] lowercaseString];
+}
+
 - (NSString *) CASServiceURL
 {
   return [self stringForKey: @"SOGoCASServiceURL"];