2009-03-30 [colin] 3.7.1cvs29
authorColin Leroy <colin@colino.net>
Mon, 30 Mar 2009 17:15:34 +0000 (17:15 +0000)
committerColin Leroy <colin@colino.net>
Mon, 30 Mar 2009 17:15:34 +0000 (17:15 +0000)
* src/imap.c
Fix Redhat bug 486422, Ubuntu bug 486422: Don't
ask for IMAP password when using GSSAPI auth

ChangeLog
PATCHSETS
configure.ac
src/imap.c

index 73e8f673b0730fc194b12860ecb5fd7339728523..31c7deeb99540996ee19ac93b0f891d340e5e2b3 100644 (file)
--- 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
index 2d60bc6ef860ae6b80d47a72760c9cd0ec0e8334..4da5a2872adf9f33e1d7f6404669ef0ffb29b559 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 >>>>>>> 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
index d1192e9ca48d507a45fcb20c5c351c4f233b3060..a2d2d4c9e5b8501a713360bc8305a624baedaaf7 100644 (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=
 
index 42a4958f29f95f2e542027e17afa95fecabe2e2b..713f16282ef0ffc0d0d144ea7af8a35914facdad 100644 (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"),