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
This commit is contained in:
Colin Leroy 2009-03-30 17:15:34 +00:00
parent 9da7f899a1
commit 00945fbbb9
4 changed files with 10 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -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"),