X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth.c;h=74aee4cfd54c48875403062e1c2a480f4e6b8cfe;hp=f5af43f9726dac031a76de6b65b92a2555ce885e;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/imap/auth.c b/imap/auth.c
index f5af43f..74aee4c 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -15,9 +15,11 @@
 # include "config.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/debug.h>
+
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
 #include "imap_private.h"
@@ -38,7 +40,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 +55,7 @@ int imap_authenticate (IMAP_DATA * idata)
 
   if (ImapAuthenticators && *ImapAuthenticators) {
     /* Try user-specified list of authentication methods */
-    methods = str_dup (ImapAuthenticators);
+    methods = m_strdup(ImapAuthenticators);
 
     for (method = methods; method; method = delim) {
       delim = strchr (method, ':');
@@ -70,7 +72,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 +80,7 @@ int imap_authenticate (IMAP_DATA * idata)
       }
     }
 
-    FREE (&methods);
+    p_delete(&methods);
   }
   else {
     /* Fall back to default: any authenticator */