X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=54c972b1a78a2775542c0646824508ce16c743f1;hp=905075ad88ec3989516159acd9a0fc538ae5509b;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 905075a..54c972b 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -9,26 +9,15 @@
 
 /* SASL login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
-
-#ifdef USE_SASL2
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
-#else
-#include <sasl.h>
-#include <saslutil.h>
-#endif
 
 /* imap_auth_sasl: Default authenticator if available. */
 imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
@@ -39,16 +28,11 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
   char buf[HUGE_STRING];
   const char *mech;
 
-#ifdef USE_SASL2
   const char *pc = NULL;
-#else
-  char *pc = NULL;
-#endif
   unsigned int len, olen;
   unsigned char client_start;
 
   if (mutt_sasl_client_new (idata->conn, &saslconn) < 0) {
-    debug_print (1, ("Error allocating SASL connection.\n"));
     return IMAP_AUTH_FAILURE;
   }
 
@@ -69,25 +53,14 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     if (mutt_bit_isset (idata->capabilities, AUTH_ANON) &&
         (!idata->conn->account.user[0] ||
          !ascii_strncmp (idata->conn->account.user, "anonymous", 9)))
-#ifdef USE_SASL2
       rc = sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, &pc, &olen,
                               &mech);
-#else
-      rc =
-        sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, NULL, &pc, &olen,
-                           &mech);
-#endif
   }
 
   if (rc != SASL_OK && rc != SASL_CONTINUE)
     do {
-#ifdef USE_SASL2
       rc = sasl_client_start (saslconn, method, &interaction,
                               &pc, &olen, &mech);
-#else
-      rc = sasl_client_start (saslconn, method, NULL, &interaction,
-                              &pc, &olen, &mech);
-#endif
       if (rc == SASL_INTERACT)
         mutt_sasl_interact (interaction);
     }
@@ -96,12 +69,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
   client_start = (olen > 0);
 
   if (rc != SASL_OK && rc != SASL_CONTINUE) {
-    if (method)
-      debug_print (2, ("%s unavailable\n", method));
-    else
-      debug_print (1, ("Failure starting authentication exchange. No shared mechanisms?\n"));
     /* SASL doesn't support LOGIN, so fall back */
-
     return IMAP_AUTH_UNAVAIL;
   }
 
@@ -118,7 +86,6 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     while (irc == IMAP_CMD_CONTINUE);
 
     if (method && irc == IMAP_CMD_NO) {
-      debug_print (2, ("%s failed\n", method));
       sasl_dispose (&saslconn);
       return IMAP_AUTH_UNAVAIL;
     }
@@ -127,20 +94,16 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
       goto bail;
 
     if (irc == IMAP_CMD_RESPOND) {
-#ifdef USE_SASL2
-      if (sasl_decode64
-          (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
-           LONG_STRING - 1,
-#else
-      if (sasl_decode64 (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
-#endif
-                         &len) != SASL_OK) {
-        debug_print (1, ("error base64-decoding server response.\n"));
+      if (sasl_decode64(idata->cmd.buf + 2, m_strlen(idata->cmd.buf + 2), buf,
+                        LONG_STRING - 1, &len) != SASL_OK) {
         goto bail;
       }
     }
 
-    if (!client_start) {
+    /* client-start is only available with the SASL-IR extension, but
+     * SASL 2.1 seems to want to use it regardless, at least for DIGEST
+     * fast reauth. Override if the server sent an initial continuation */
+    if (!client_start || buf[0]) {
       do {
         rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
         if (rc == SASL_INTERACT)
@@ -154,26 +117,18 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     /* send out response, or line break if none needed */
     if (olen) {
       if (sasl_encode64 (pc, olen, buf, sizeof (buf), &olen) != SASL_OK) {
-        debug_print (1, ("error base64-encoding client response.\n"));
         goto bail;
       }
-
-      /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
-       * free it */
-#ifndef USE_SASL2
-      FREE (&pc);
-#endif
     }
 
     if (irc == IMAP_CMD_RESPOND) {
-      strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
+      m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n");
       mutt_socket_write (idata->conn, buf);
     }
 
     /* If SASL has errored out, send an abort string to the server */
     if (rc < 0) {
       mutt_socket_write (idata->conn, "*\r\n");
-      debug_print (1, ("sasl_client_step error %d\n", rc));
     }
 
     olen = 0;