[evolution-patches] Re: Excahnge connector - issues with SSL settings

[Sushma Rai <rsushma novell com>]

Hi,

This is the patch for several issues with Evolution Exchange connector
with SSL configured server.

I have got it peer reviewed at evolution-patches list.
Can I commit this to gnome-2-10 branch?

Thanks,
Sushma.

On Thu, 2005-03-03 at 12:17 +0530, Sarfraaz Ahmed wrote:
> This patch looks good. I think this should get into 2.2.0, since the
> users would not be able to use their accounts with ssl support,
> without this patch. Please ask release-team for approval.
> 
> Thanks
> -- Sarfraaz
> 
> On Wed, 2005-03-02 at 19:01 +0530, Sushma Rai wrote: 
> > Hi,
> > 
> > here is the patch for all the connector issues with SSL 
> > settings.
> > Please review.
> > 
> > Thanks,
> > Sushma.

Index: storage/exchange-account.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-account.c,v
retrieving revision 1.36
diff -u -p -r1.36 exchange-account.c
--- storage/exchange-account.c	26 Feb 2005 14:19:16 -0000	1.36
+++ storage/exchange-account.c	2 Mar 2005 13:18:08 -0000
@@ -1753,7 +1753,7 @@ exchange_account_new (EAccountList *acco
 {
 	ExchangeAccount *account;
 	char *enc_user, *mailbox;
-	const char *param, *proto, *owa_path, *pf_server, *owa_url; 
+	const char *param, *proto="http", *owa_path, *pf_server, *owa_url; 
 	const char *passwd_exp_warn_period, *offline_sync;
 	E2kUri *uri;
 
@@ -1835,13 +1835,18 @@ exchange_account_new (EAccountList *acco
 	if (!pf_server || !*pf_server)
 		pf_server = uri->host;
 
-	/* Now we can set protocol reading owa_url, instead of having 
-	   use_ssl parameter */
-	proto = e2k_uri_get_param (uri, "use_ssl") ? "https" : "http";
+	/* We set protocol reading owa_url, instead of having use_ssl parameter 
+	 * because we don't have SSL section anymore in the account creation
+	 * druid and account editor
+	 */
+	/* proto = e2k_uri_get_param (uri, "use_ssl") ? "https" : "http"; */
 
 	owa_url = e2k_uri_get_param (uri, "owa_url");
-	if (owa_url)
+	if (owa_url) {
 		account->priv->owa_url = g_strdup (owa_url); 
+		if (!strncmp (owa_url, "https:", 6))
+			proto = "https";
+	}
 
 	if (uri->port != 0) {
 		account->priv->http_uri_schema =
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.281
diff -u -r1.281 ChangeLog
--- ChangeLog	2 Mar 2005 07:02:29 -0000	1.281
+++ ChangeLog	2 Mar 2005 13:25:40 -0000
@@ -1,3 +1,11 @@
+2005-03-02  Sushma Rai  <rsushma novell com>
+
+	* storage/exchange-account.c (exchange_account_new): Setting the 
+	porotcol based on OWA URL specified by the user, instead of use_ssl
+	parameter. Since we don't have a SSL section now, use_ssl is getting
+	lost when user does modifications to his account settings.
+	Fixes #73202, #72834, #73017, #72836, and #72881
+
 2005-03-02  Rajesh Ranjan <rranjan redhat com>
 	* configure.in : Added hi to ALL_LINGUAS.