From 43f248db6f65c52fe9cbcce4203e8026399d0c11 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 18 Jun 2010 13:30:05 +0000 Subject: [PATCH] Monotone-Parent: 51ae133015c75bd8a41f4433161a2453843b1e5d Monotone-Revision: d79b964251d15b7acc0c9041a52208b72d00bbd6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-18T13:30:05 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/SOGo/SOGoDAVAuthenticator.m | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34f49283a..0d92c03af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-06-18 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoDAVAuthenticator.m (-checkLogin:andPassword:) + (imapPasswordInContext:forServer:forceRenew:): when using CAS + authentication, make use of the password as a CAS ticket instead + of as identifier, since we don't make use of those in DAV. + 2010-06-17 Francis Lachapelle * UI/WebServerResources/UIxMailToSelection.js diff --git a/SoObjects/SOGo/SOGoDAVAuthenticator.m b/SoObjects/SOGo/SOGoDAVAuthenticator.m index 264011e27..be9ee902e 100644 --- a/SoObjects/SOGo/SOGoDAVAuthenticator.m +++ b/SoObjects/SOGo/SOGoDAVAuthenticator.m @@ -70,8 +70,8 @@ if ([[sd davAuthenticationType] isEqualToString: @"cas"]) { /* CAS authentication for DAV requires using a proxy */ - session = [SOGoCASSession CASSessionWithIdentifier: _pwd - fromProxy: YES]; + session = [SOGoCASSession CASSessionWithTicket: _pwd + fromProxy: YES]; if (session) rc = [[session login] isEqualToString: _login]; } @@ -111,8 +111,8 @@ sd = [SOGoSystemDefaults sharedSystemDefaults]; if ([[sd davAuthenticationType] isEqualToString: @"cas"]) { - session = [SOGoCASSession CASSessionWithIdentifier: password - fromProxy: YES]; + session = [SOGoCASSession CASSessionWithTicket: password + fromProxy: YES]; service = [NSString stringWithFormat: @"imap://%@", imapServer]; if (renew) [session invalidateTicketForService: service];