aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/groupwise-features/proxy-login.c
diff options
context:
space:
mode:
authorSankar P <psankar@novell.com>2006-03-01 14:43:51 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2006-03-01 14:43:51 +0800
commitfaeb1107d2d9a90c8dd2562ed1df862f9e11ef22 (patch)
treea3c3640a6143ad0380bb3486d0a0b9b1ad07e0a6 /plugins/groupwise-features/proxy-login.c
parentf0bd85bf3604222efdc3f5b308daef64041b7889 (diff)
downloadgsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.tar
gsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.tar.gz
gsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.tar.bz2
gsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.tar.lz
gsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.tar.xz
gsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.tar.zst
gsoc2013-evolution-faeb1107d2d9a90c8dd2562ed1df862f9e11ef22.zip
Takes care of non SSL accounts too. Fixes #332948
2006-03-01 Sankar P <psankar@novell.com> * proxy-login.c: (proxy_get_password) (proxy_login_get_cnc): Takes care of non SSL accounts too. Fixes #332948 svn path=/trunk/; revision=31615
Diffstat (limited to 'plugins/groupwise-features/proxy-login.c')
-rw-r--r--plugins/groupwise-features/proxy-login.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 416ce86e04..3d39c3bc18 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -193,7 +193,7 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
{
char *uri, *failed_auth, *key, *prompt;
CamelURL *url;
- const char *poa_address, *use_ssl, *soap_port;
+ const char *poa_address, *use_ssl = NULL, *soap_port;
url = camel_url_new (account->source->url, NULL);
if (url == NULL)
@@ -210,7 +210,7 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
key = g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
- if (!g_str_equal (use_ssl, "never"))
+ if (use_ssl && !g_str_equal (use_ssl, "never"))
uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
else
uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
@@ -237,7 +237,7 @@ proxy_login_get_cnc (EAccount *account)
CamelURL *url;
url = camel_url_new (account->source->url, NULL);
char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
- const char *use_ssl, *soap_port;
+ const char *use_ssl = NULL, *soap_port;
gboolean remember;
url = camel_url_new (account->source->url, NULL);
@@ -252,7 +252,7 @@ proxy_login_get_cnc (EAccount *account)
use_ssl = camel_url_get_param (url, "use_ssl");
key = g_strdup_printf ("groupwise://%s@%s/", url->user, url->host);
- if (!g_str_equal (use_ssl, "never"))
+ if (use_ssl && !g_str_equal (use_ssl, "never"))
uri = g_strdup_printf ("https://%s:%s/soap", url->host, soap_port);
else
uri = g_strdup_printf ("http://%s:%s/soap", url->host, soap_port);