diff options
| author | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2007-06-04 10:07:45 +0000 |
|---|---|---|
| committer | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2007-06-04 10:07:45 +0000 |
| commit | 73ac0ec054afef782dbd863b582518801a67d219 (patch) | |
| tree | 874a14caa1fec7d9305db0d6e22623d8ce3647cb /servers | |
| parent | 6cbfbdb873bcf687a8e8d4b2a86bbd0e4f1d61fb (diff) | |
| download | evolution-data-server-73ac0ec054afef782dbd863b582518801a67d219.tar.gz | |
Fixes #415922 - Patch submitted by Kenny <kenny@the-b.org>
* Fixes #415922 - Patch submitted by Kenny <kenny@the-b.org>
svn path=/trunk/; revision=7801
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/exchange/ChangeLog | 7 | ||||
| -rw-r--r-- | servers/exchange/lib/e2k-autoconfig.c | 7 | ||||
| -rw-r--r-- | servers/exchange/lib/e2k-context.c | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/servers/exchange/ChangeLog b/servers/exchange/ChangeLog index 6229cf117..0d248c352 100644 --- a/servers/exchange/ChangeLog +++ b/servers/exchange/ChangeLog @@ -1,3 +1,10 @@ +2007-06-04 Veerapuram Varadhan <vvaradhan@novell.com> + + ** Fixes #415922 + * lib/e2k-autoconfig.c (e2k_autoconfig_get_context): Add support + for Microsoft ISA Server 2004 proxy URLs. + * lib/e2k-context.c (e2k_context_fba): Decode the URI - just incase. + 2007-05-15 Ross Burton <ross@openedhand.com> * lib/e2k-user-dialog.c: diff --git a/servers/exchange/lib/e2k-autoconfig.c b/servers/exchange/lib/e2k-autoconfig.c index 0c87ad84d..afd219b81 100644 --- a/servers/exchange/lib/e2k-autoconfig.c +++ b/servers/exchange/lib/e2k-autoconfig.c @@ -442,7 +442,9 @@ e2k_autoconfig_get_context (E2kAutoconfig *ac, E2kOperation *op, /* A redirection to "logon.asp" means this is Exchange 5.5 * OWA. A redirection to "owalogon.asp" means this is Exchange - * 2003 forms-based authentication. Other redirections most + * 2003 forms-based authentication. A redirection to + * "CookieAuth.dll" means that it's an Exchange 2003 server + * behind an ISA Server 2004 proxy. Other redirections most * likely indicate that the user's mailbox has been moved to a * new server. */ @@ -460,7 +462,8 @@ e2k_autoconfig_get_context (E2kAutoconfig *ac, E2kOperation *op, if (strstr (location, "/logon.asp")) { *result = E2K_AUTOCONFIG_EXCHANGE_5_5; goto done; - } else if (strstr (location, "/owalogon.asp")) { + } else if (strstr (location, "/owalogon.asp") || + strstr (location, "/CookieAuth.dll")) { if (e2k_context_fba (ctx, msg)) goto try_again; *result = E2K_AUTOCONFIG_AUTH_ERROR; diff --git a/servers/exchange/lib/e2k-context.c b/servers/exchange/lib/e2k-context.c index 98a760ed6..cfd2ac599 100644 --- a/servers/exchange/lib/e2k-context.c +++ b/servers/exchange/lib/e2k-context.c @@ -603,6 +603,7 @@ e2k_context_fba (E2kContext *ctx, SoupMessage *failed_msg) g_free (suri->path); suri->path = g_strdup (value); action = soup_uri_to_string (suri, FALSE); + soup_uri_decode (action); soup_uri_free (suri); } else action = g_strdup (value); |