moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Caldav: accept login as alias in caldav principals path 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1428 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-09-08 20:40:19 +00:00
parent 146790a237
commit 5911e0b431
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/davmail/caldav/CaldavConnection.java
View File

@ -885,7 +885,8 @@ public class CaldavConnection extends AbstractConnection {
public void sendPrincipal(CaldavRequest request, String prefix, String principal) throws IOException {
// actual principal is email address
String actualPrincipal = principal;
if ("users".equals(prefix) && session.getAlias().equalsIgnoreCase(principal)) {
if ("users".equals(prefix) &&
(session.getAlias().equalsIgnoreCase(principal) || session.getAliasFromLogin().equalsIgnoreCase(principal))) {
actualPrincipal = session.getEmail();
}

4
src/java/davmail/exchange/ExchangeSession.java
View File

@ -2663,14 +2663,14 @@ public abstract class ExchangeSession {
*
* @return user name
*/
protected String getAliasFromLogin() {
public String getAliasFromLogin() {
// login is email, not alias
if (this.userName.indexOf('@') >= 0) {
return null;
}
String result = this.userName;
// remove domain name
int index = result.indexOf('\\');
int index = Math.max(result.indexOf('\\'), result.indexOf('/'));
if (index >= 0) {
result = result.substring(index + 1);
}