X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_auth.c;h=5dc846d4ba9a945ff7ebf88012c42ab0db116d38;hp=194f33b26752a9d1d969cda5d60d8b25cae2b049;hb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 194f33b..5dc846d 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -11,27 +11,23 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
+
 #include "mutt.h"
 #include "mx.h"
-#include "md5.h"
 #include "pop.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <string.h>
 #include <unistd.h>
 
 #ifdef USE_SASL
-#ifdef USE_SASL2
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
-#else
-#include <sasl.h>
-#include <saslutil.h>
-#endif
-
 #include "mutt_sasl.h"
 #endif
 
@@ -46,10 +42,8 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   char inbuf[LONG_STRING];
   const char *mech;
 
-#ifdef USE_SASL2
+#ifdef USE_SASL
   const char *pc = NULL;
-#else
-  char *pc = NULL;
 #endif
   unsigned int len, olen;
   unsigned char client_start;
@@ -62,13 +56,10 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   if (!method)
     method = pop_data->auth_list;
 
-  FOREVER {
-#ifdef USE_SASL2
+  for (;;) {
+#ifdef USE_SASL
     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)
       break;
@@ -90,7 +81,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   olen = strlen (buf);
 
   /* looping protocol */
-  FOREVER {
+  for (;;) {
     strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
     mutt_socket_write (pop_data->conn, buf);
     if (mutt_socket_readln (inbuf, sizeof (inbuf), pop_data->conn) < 0) {
@@ -102,13 +93,10 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
     if (rc != SASL_CONTINUE)
       break;
 
-#ifdef USE_SASL2
+#ifdef USE_SASL
     if (!str_ncmp (inbuf, "+ ", 2)
         && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
                           &len) != SASL_OK)
-#else
-    if (!str_ncmp (inbuf, "+ ", 2)
-        && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK)
 #endif
     {
       debug_print (1, ("error base64-decoding server response.\n"));
@@ -116,7 +104,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
     }
 
     if (!client_start)
-      FOREVER {
+      for (;;) {
       rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
       if (rc != SASL_INTERACT)
         break;
@@ -137,8 +125,8 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
 
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */
-#ifndef USE_SASL2
-      FREE (&pc);
+#ifndef USE_SASL
+      p_delete(&pc);
 #endif
     }
   }
@@ -174,11 +162,11 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
 {
   char *p1, *p2;
 
-  FREE (&pop_data->timestamp);
+  p_delete(&pop_data->timestamp);
 
   if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
     p2[1] = '\0';
-    pop_data->timestamp = str_dup (p1);
+    pop_data->timestamp = m_strdup(p1);
   }
 }
 
@@ -216,10 +204,13 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
     return POP_A_SUCCESS;
   case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;
+  case PFD_FUNCT_ERROR:
+  case PQ_ERR:
+  default:
+    break;
   }
 
-  mutt_error _("APOP authentication failed.");
-
+  mutt_error ("%s %s", _("APOP authentication failed."), pop_data->err_msg);
   mutt_sleep (2);
 
   return POP_A_FAILURE;
@@ -270,6 +261,10 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
     return POP_A_SUCCESS;
   case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;
+  case PFD_FUNCT_ERROR:
+  case PQ_ERR:
+  default:
+    break;
   }
 
   mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);
@@ -284,7 +279,7 @@ static pop_auth_t pop_authenticators[] = {
 #endif
   {pop_auth_apop, "apop"},
   {pop_auth_user, "user"},
-  {NULL}
+  {NULL, NULL}
 };
 
 /*
@@ -310,7 +305,7 @@ pop_query_status pop_authenticate (POP_DATA * pop_data)
 
   if (PopAuthenticators && *PopAuthenticators) {
     /* Try user-specified list of authentication methods */
-    methods = str_dup (PopAuthenticators);
+    methods = m_strdup(PopAuthenticators);
     method = methods;
 
     while (method) {
@@ -349,7 +344,7 @@ pop_query_status pop_authenticate (POP_DATA * pop_data)
       method = comma;
     }
 
-    FREE (&methods);
+    p_delete(&methods);
   }
   else {
     /* Fall back to default: any authenticator */