rationalize list handling in mutt a bit.

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

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index e5f1bce..197a18e 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -18,7 +18,7 @@
 #include "auth.h"
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/debug.h>
 
 #include <netinet/in.h>
 
@@ -115,7 +115,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length,
                   sizeof (buf1) - 2);
   gss_release_buffer (&min_stat, &send_token);
-  str_cat (buf1, sizeof (buf1), "\r\n");
+  m_strcat(buf1, sizeof(buf1), "\r\n");
   mutt_socket_write (idata->conn, buf1);
 
   while (maj_stat == GSS_S_CONTINUE_NEEDED) {
@@ -150,7 +150,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
     mutt_to_base64 ((unsigned char *) buf1, send_token.value,
                     send_token.length, sizeof (buf1) - 2);
     gss_release_buffer (&min_stat, &send_token);
-    str_cat (buf1, sizeof (buf1), "\r\n");
+    m_strcat(buf1, sizeof(buf1), "\r\n");
     mutt_socket_write (idata->conn, buf1);
   }
 
@@ -213,7 +213,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length,
                   sizeof (buf1) - 2);
   debug_print (2, ("Requesting authorisation as %s\n", idata->conn->account.user));
-  str_cat (buf1, sizeof (buf1), "\r\n");
+  m_strcat(buf1, sizeof(buf1), "\r\n");
   mutt_socket_write (idata->conn, buf1);
 
   /* Joy of victory or agony of defeat? */