amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-11 11:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 1aac0a8e6c7ea5d24479bcc2272829762708cb56

Browse Source 
Monotone-Revision: 2a59bba0a73aaeebae8c13b21e4099f844924b1b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-15T14:39:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-06-15 14:39:11 +00:00
parent 099148ae17
commit 030514e4e1
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoDAVAuthenticator.m
+17 -20
View File
@@ -57,27 +57,24 @@
int expire, grace;
BOOL rc;
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([[sd davAuthenticationType] isEqualToString: @"cas"])
perr = PolicyNoError;
rc = ([[SOGoUserManager sharedUserManager] checkLogin: _login
password: _pwd
perr: &perr
expire: &expire
grace: &grace]
&& perr == PolicyNoError);
if (!rc)
{
/* CAS authentication for DAV requires using a proxy */
session = [SOGoCASSession CASSessionWithIdentifier: _pwd
fromProxy: YES];
if (session)
rc = [[session login] isEqualToString: _login];
else
rc = NO;
}
else
{
perr = PolicyNoError;
rc = ([[SOGoUserManager sharedUserManager] checkLogin: _login
password: _pwd
perr: &perr
expire: &expire
grace: &grace]
&& perr == PolicyNoError);
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([[sd davAuthenticationType] isEqualToString: @"cas"])
{
/* CAS authentication for DAV requires using a proxy */
session = [SOGoCASSession CASSessionWithIdentifier: _pwd
fromProxy: YES];
if (session)
rc = [[session login] isEqualToString: _login];
}
}
return rc;