2008-05-31 [colin] 3.4.0cvs76
authorColin Leroy <colin@colino.net>
Sat, 31 May 2008 16:10:29 +0000 (16:10 +0000)
committerColin Leroy <colin@colino.net>
Sat, 31 May 2008 16:10:29 +0000 (16:10 +0000)
* src/imap.c
Fix login issue introduced in cvs75.

ChangeLog
PATCHSETS
configure.ac
src/imap.c

index 304b81e15cd02e6f3e16e3c3b6b0ff42b716e26b..8ac484790f089b722b329e123ebf9e0f6ad1d82a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-31 [colin]     3.4.0cvs76
+
+       * src/imap.c
+               Fix login issue introduced in cvs75.
+
 2008-05-31 [colin]     3.4.0cvs75
 
        * src/imap.c
index 8a1820bb42fdb0577790e18b2847c05395f8a83a..5729aef73a5c8f6b333e5127996145da1a96c502 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.60.2.53 -r 1.60.2.54 src/procmsg.h;  ) > 3.4.0cvs73.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/keyboard.xml;  ) > 3.4.0cvs74.patchset
 ( cvs diff -u -r 1.179.2.223 -r 1.179.2.224 src/imap.c;  ) > 3.4.0cvs75.patchset
+( cvs diff -u -r 1.179.2.224 -r 1.179.2.225 src/imap.c;  ) > 3.4.0cvs76.patchset
index a1067351ece4211911644349f486eafd94ba2e4a..6683843d6306697a51db6231b8a28ad28d579d15 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=75
+EXTRA_VERSION=76
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 302bc448ec300fe548463d84bb663df17aa1ce0e..f25b87ea67e8ee2b94cb7b04ea8f0aaf3aa432c4 100644 (file)
@@ -817,7 +817,7 @@ static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
 static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass,
                      IMAPAuthType type)
 {
-       gint ok = MAILIMAP_ERROR_BAD_STATE;
+       gint ok = MAILIMAP_ERROR_LOGIN;
        static time_t last_login_err = 0;
        gchar *ext_info = "";
        int r;
@@ -3449,11 +3449,11 @@ static gint imap_cmd_login(IMAPSession *session,
                                        "has been compiled without OpenSSL "
                                        "support.\n"),
                                        SESSION(session)->server);
-                       return MAILIMAP_ERROR_BAD_STATE;
+                       return MAILIMAP_ERROR_LOGIN;
 #endif
                } else {
                        log_error(LOG_PROTOCOL, _("Server logins are disabled.\n"));
-                       return MAILIMAP_ERROR_BAD_STATE;
+                       return MAILIMAP_ERROR_LOGIN;
                }
        }