Rocco Rutte:

[apps/madmutt.git] / imap / auth_sasl.c

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index fa1714f..71b8f49 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -23,13 +23,8 @@
 #include "lib/intl.h"
 #include "lib/debug.h"
 
 #include "lib/intl.h"
 #include "lib/debug.h"
 

-#ifdef USE_SASL2

 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 #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)
 
 /* imap_auth_sasl: Default authenticator if available. */
 imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)


@@ -40,11 +35,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
   char buf[HUGE_STRING];
   const char *mech;
 
   char buf[HUGE_STRING];
   const char *mech;
 

-#ifdef USE_SASL2

   const char *pc = NULL;
   const char *pc = NULL;

-#else
-  char *pc = NULL;
-#endif

   unsigned int len, olen;
   unsigned char client_start;
 
   unsigned int len, olen;
   unsigned char client_start;
 


@@ -70,25 +61,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)))
     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);
       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 {
   }
 
   if (rc != SASL_OK && rc != SASL_CONTINUE)
     do {

-#ifdef USE_SASL2

       rc = sasl_client_start (saslconn, method, &interaction,
                               &pc, &olen, &mech);
       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);
     }
       if (rc == SASL_INTERACT)
         mutt_sasl_interact (interaction);
     }


@@ -128,13 +108,9 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
       goto bail;
 
     if (irc == IMAP_CMD_RESPOND) {
       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,
       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"));
         goto bail;
                          &len) != SASL_OK) {
         debug_print (1, ("error base64-decoding server response.\n"));
         goto bail;


@@ -164,9 +140,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
 
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */
 
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */

-#ifndef USE_SASL2

       mem_free (&pc);
       mem_free (&pc);

-#endif

     }
 
     if (irc == IMAP_CMD_RESPOND) {
     }
 
     if (irc == IMAP_CMD_RESPOND) {