The SASL intial response capability name is changed in

draft-siemborski-imap-sasl-initial-response-01b.txt to SASL-IR (imho a
better name). Currently Cyrus 2.2.2-BETA advertise SASL-IR and the next UW
release will do that too.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6050 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index eaaddaf78e5cc09c7cd9a6fba292655e6d595338..5e755b5d2ada1399555777cfafab99d2f12da6d3 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -667,11 +667,11 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
          *
          **/
         $tag=sqimap_session_id(false);
          *
          **/
         $tag=sqimap_session_id(false);

-        $sasl = (isset($capability['SASL']) && $capability['SASL']) ? true : false;
+        $sasl = (isset($capability['SASL-IR']) && $capability['SASL-IR']) ? true : false;

         $auth = base64_encode("$username\0$username\0$password");
         if ($sasl) {
             // IMAP Extension for SASL Initial Client Response
         $auth = base64_encode("$username\0$username\0$password");
         if ($sasl) {
             // IMAP Extension for SASL Initial Client Response

-            // <draft-siemborski-imap-sasl-initial-response-00.txt>
+            // <draft-siemborski-imap-sasl-initial-response-01b.txt>

             $query = $tag . " AUTHENTICATE PLAIN $auth\r\n";
             fputs($imap_stream, $query);
             $read = sqimap_fgets($imap_stream);
             $query = $tag . " AUTHENTICATE PLAIN $auth\r\n";
             fputs($imap_stream, $query);
             $read = sqimap_fgets($imap_stream);