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

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 194f33b..919a3ab 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -12,6 +12,7 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
 #include "mx.h"
 #include "md5.h"
 #include "pop.h"
@@ -138,7 +139,7 @@ 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);
+      mem_free (&pc);
 #endif
     }
   }
@@ -174,7 +175,7 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
 {
   char *p1, *p2;
 
-  FREE (&pop_data->timestamp);
+  mem_free (&pop_data->timestamp);
 
   if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
     p2[1] = '\0';
@@ -216,10 +217,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 +274,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);
@@ -349,7 +357,7 @@ pop_query_status pop_authenticate (POP_DATA * pop_data)
       method = comma;
     }
 
-    FREE (&methods);
+    mem_free (&methods);
   }
   else {
     /* Fall back to default: any authenticator */