diff options
| -rw-r--r-- | plugins/groupwise-account-setup/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/groupwise-account-setup/camel-gw-listener.c | 17 |
2 files changed, 20 insertions, 5 deletions
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog index 7d2fe3a9f4..13935b83f2 100644 --- a/plugins/groupwise-account-setup/ChangeLog +++ b/plugins/groupwise-account-setup/ChangeLog @@ -1,3 +1,11 @@ +2005-09-16 Vivek Jain <jvivek@novell.com> + + * camel-gw-listener.c:(get_addressbook_names_from_server) + uncache the password if it could not authenticate, else since we + remember it always it kept getting wrong one + use 'flags' variable which served no purpose till now + **Fixes #313078 + 2005-08-23 Not Zed <NotZed@Ximian.com> * groupwise-account-setup.c (org_gnome_groupwise_account_setup): diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index e2d3784f88..8aa5daf1e4 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -428,13 +428,13 @@ get_addressbook_names_from_server (char *source_url) const char *soap_port; CamelURL *url; gboolean remember; - char *failed_auth; + char *failed_auth = NULL; char *prompt; char *password_prompt; char *uri; const char *use_ssl; const char *poa_address; - guint32 flags = E_PASSWORDS_REMEMBER_FOREVER; + guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET; url = camel_url_new (source_url, NULL); if (url == NULL) { @@ -456,17 +456,22 @@ get_addressbook_names_from_server (char *source_url) else uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port); - failed_auth = ""; cnc = NULL; do { + /*we have to uncache the password before prompting again*/ + if (failed_auth) { + e_passwords_forget_password ("Groupwise", key); + password = NULL; + } + password = e_passwords_get_password ("Groupwise", key); if (!password) { password_prompt = g_strdup_printf (_("Enter password for %s (user %s)"), poa_address, url->user); - prompt = g_strconcat (failed_auth, password_prompt, NULL); + prompt = g_strconcat (failed_auth ? failed_auth : "", password_prompt, NULL); g_free (password_prompt); password = e_passwords_ask_password (prompt, "Groupwise", key, prompt, - E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, + flags, &remember, NULL); g_free (prompt); @@ -494,6 +499,8 @@ get_addressbook_names_from_server (char *source_url) } + /*FIXME: This error message should be relocated to addressbook and should reflect + * that it actually failed to get the addressbooks*/ e_error_run (NULL, "mail:gw-accountsetup-error", poa_address, NULL); return NULL; } |