aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/session.c9
2 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5c9a533f90..24085368e7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-04-12 Jeffrey Stedfast <fejj@ximian.com>
+ * session.c (auth_callback): If the service is NULL, just use the
+ item as the key.
+
* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Use the
CamelCipherHash enum.
(mail_crypto_pgp_mime_part_verify): Use a CamelCipherValidity.
diff --git a/mail/session.c b/mail/session.c
index d95367d77c..28694f39a1 100644
--- a/mail/session.c
+++ b/mail/session.c
@@ -125,9 +125,12 @@ auth_callback (CamelAuthCallbackMode mode, char *data, gboolean secret,
char *key, *ans, *url;
gboolean accept;
- url = camel_url_to_string (service->url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
- key = g_strdup_printf ("%s:%s", url, item);
- g_free (url);
+ if (service) {
+ url = camel_url_to_string (service->url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
+ key = g_strdup_printf ("%s:%s", url, item);
+ g_free (url);
+ } else
+ key = g_strdup (item);
switch (mode) {
case CAMEL_AUTHENTICATOR_TELL: