X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=8544352878bc97cf9f5a79a6585cff3eb56c53e9;hp=436b3313a3daa1e6c36f9aa6d8c9c1d697882a66;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 436b331..8544352 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -14,15 +14,14 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
 
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -41,7 +40,6 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
   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;
   }
 
@@ -78,12 +76,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;
   }
 
@@ -100,7 +93,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;
     }
@@ -109,11 +101,8 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
       goto bail;
 
     if (irc == IMAP_CMD_RESPOND) {
-      if (sasl_decode64
-          (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
-           LONG_STRING - 1,
-                         &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;
       }
     }
@@ -135,20 +124,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;
       }
     }
 
     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;