Not being able to start an IMAP command is a fatal error.

Closes #3155.

diff --git a/ChangeLog b/ChangeLog
index 760781d2a5dd94fd1e289069e2772ed0b710d824..eb59cdbee882cc317ab6597a5351a12b2a77d656 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-28 16:00 -0700  Brendan Cully  <brendan@kublai.com>  (de948f407a1b)
+
+       * imap/auth_login.c: IMAP LOGIN does not support separate user and
+       login accounts. Use the user account for both. Closes #3240.
+
+2009-06-28 22:40 +0200  Rocco Rutte  <pdmef@gmx.net>  (71a84cf22c42)
+
+       * url.c, url.h: Fix URL parser to encode paths
+
 2009-06-28 15:42 +0200  Deng Xiyue  <manphiz@gmail.com>  (fe688db8099a)
 
        * po/zh_CN.po: Update Simplified Chinese translation. Closes #3281.
@@ -6,8 +15,6 @@
 
        * hg-commit: hg-commit: drop changelog entries from hg log
 
-2009-06-27 17:03 +0200  Rocco Rutte  <pdmef@gmx.net>  (8f7166888c6d)
-
        * doc/makedoc.c, doc/manual.xml.head: Manual: stop using DocBook
        entities mapping to ascii chars
 

diff --git a/imap/command.c b/imap/command.c
index 304ae6eb9907c6d6eb57474bdc272eff472b1860..2968ca2f44f20c94a94ba68a48a1832c94e7da8d 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -233,9 +233,6 @@ int imap_exec (IMAP_DATA* idata, const char* cmdstr, int flags)
   int rc;
 
   if ((rc = cmd_start (idata, cmdstr, flags)) < 0)
-    return rc;
-
-  if (rc < 0)
   {
     cmd_handle_fatal (idata);
     return -1;