From: Colin Leroy Date: Mon, 30 Mar 2009 17:15:34 +0000 (+0000) Subject: 2009-03-30 [colin] 3.7.1cvs29 X-Git-Tag: rel_3_7_2~61 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=00945fbbb90050013a4395a6da628cc5371a52d1 2009-03-30 [colin] 3.7.1cvs29 * src/imap.c Fix Redhat bug 486422, Ubuntu bug 486422: Don't ask for IMAP password when using GSSAPI auth --- diff --git a/ChangeLog b/ChangeLog index 73e8f673b..31c7deeb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-30 [colin] 3.7.1cvs29 + + * src/imap.c + Fix Redhat bug 486422, Ubuntu bug 486422: Don't + ask for IMAP password when using GSSAPI auth + 2009-03-27 [colin] 3.7.1cvs28 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index 2d60bc6ef..4da5a2872 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3771,3 +3771,4 @@ >>>>>>> 1.1.2.3777 ( cvs diff -u -r 1.179.2.244 -r 1.179.2.245 src/imap.c; ) > 3.7.1cvs27.patchset ( cvs diff -u -r 1.213.2.191 -r 1.213.2.192 src/folder.c; ) > 3.7.1cvs28.patchset +( cvs diff -u -r 1.179.2.245 -r 1.179.2.246 src/imap.c; ) > 3.7.1cvs29.patchset diff --git a/configure.ac b/configure.ac index d1192e9ca..a2d2d4c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=28 +EXTRA_VERSION=29 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/imap.c b/src/imap.c index 42a4958f2..713f16282 100644 --- a/src/imap.c +++ b/src/imap.c @@ -1166,7 +1166,7 @@ static gint imap_session_authenticate(IMAPSession *session, acc_pass = account->passwd; try_again: pass = acc_pass; - if (!pass && account->imap_auth_type != IMAP_AUTH_ANON) { + if (!pass && account->imap_auth_type != IMAP_AUTH_ANON && account->imap_auth_type != IMAP_AUTH_GSSAPI) { gchar *tmp_pass; tmp_pass = input_dialog_query_password_keep(account->recv_server, account->userid, @@ -1175,7 +1175,7 @@ try_again: return MAILIMAP_NO_ERROR; Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return MAILIMAP_NO_ERROR;}); g_free(tmp_pass); - } else if (account->imap_auth_type == IMAP_AUTH_ANON) { + } else if (account->imap_auth_type == IMAP_AUTH_ANON || account->imap_auth_type == IMAP_AUTH_GSSAPI) { pass = ""; } statuswindow_print_all(_("Connecting to IMAP4 server %s...\n"),