Changeset 4203 in subversion for trunk/roundcubemail/program/include/rcube_imap_generic.php

Timestamp:

Nov 9, 2010 8:49:31 AM (3 years ago)

Author:

alec

Message:

• Fix lack of IMAP server response in logged error message when using AUTHENTICATE PLAIN with SASL-IR

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -119 +119 @@
     const COMMAND_NORESPONSE = 1;
     const COMMAND_CAPABILITY = 2;
+    const COMMAND_LASTLINE   = 4;
 
     /**
@@ -492 +493 @@
             // RFC 4959 (SASL-IR): save one round trip
             if ($this->getCapability('SASL-IR')) {
-                $result = $this->execute("AUTHENTICATE PLAIN", array($reply),
-                    self::COMMAND_NORESPONSE | self::COMMAND_CAPABILITY);
+                list($result, $line) = $this->execute("AUTHENTICATE PLAIN", array($reply),
+                    self::COMMAND_LASTLINE | self::COMMAND_CAPABILITY);
             }
             else {
@@ -2889 +2890 @@
             }
 
+        // return last line only (without command tag and result)
+        if ($line && ($options & self::COMMAND_LASTLINE)) {
+            $response = preg_replace("/^$tag (OK|NO|BAD|BYE|PREAUTH)?\s*/i", '', trim($line));
+        }
+
             return $noresp ? $code : array($code, $response);
     }