X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fauth.c;h=4861fbbe9c85c854d0d03890fb92f287ef3e868a;hb=23002a877577341cfd68687e58348e0ca01b1ac5;hp=448220ea31ed5959601e6f3a912c7a2a4793ceea;hpb=814a01519c9605d479201b99eb16c97b0ad8635d;p=apps%2Fmadmutt.git

diff --git a/imap/auth.c b/imap/auth.c
index 448220e..4861fbb 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -15,11 +15,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
 
 #include "mutt.h"
+#include "ascii.h"
 #include "imap_private.h"
 #include "auth.h"
 
@@ -38,7 +41,7 @@ static imap_auth_t imap_authenticators[] = {
 #endif
   {imap_auth_login, "login"},
 
-  {NULL}
+  {NULL, NULL}
 };
 
 /* imap_authenticate: Attempt to authenticate using either user-specified
@@ -53,7 +56,7 @@ int imap_authenticate (IMAP_DATA * idata)
 
   if (ImapAuthenticators && *ImapAuthenticators) {
     /* Try user-specified list of authentication methods */
-    methods = safe_strdup (ImapAuthenticators);
+    methods = str_dup (ImapAuthenticators);
 
     for (method = methods; method; method = delim) {
       delim = strchr (method, ':');
@@ -70,7 +73,7 @@ int imap_authenticate (IMAP_DATA * idata)
             !ascii_strcasecmp (authenticator->method, method))
           if ((r = authenticator->authenticate (idata, method)) !=
               IMAP_AUTH_UNAVAIL) {
-            FREE (&methods);
+            p_delete(&methods);
             return r;
           }
 
@@ -78,7 +81,7 @@ int imap_authenticate (IMAP_DATA * idata)
       }
     }
 
-    FREE (&methods);
+    p_delete(&methods);
   }
   else {
     /* Fall back to default: any authenticator */