X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_gss.c;h=ff51d89fa57081092bd845433a0d713ef1058ca3;hp=f80f50623456d50fb84afe41076cb0f587f2ab97;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index f80f506..ff51d89 100644
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -17,7 +17,7 @@
 #include "imap_private.h"
 #include "auth.h"
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include <netinet/in.h>
@@ -60,7 +60,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   /* get an IMAP service ticket for the server */
   snprintf (buf1, sizeof (buf1), "imap@%s", idata->conn->account.host);
   request_buf.value = buf1;
-  request_buf.length = str_len (buf1) + 1;
+  request_buf.length = m_strlen(buf1) + 1;
   maj_stat = gss_import_name (&min_stat, &request_buf, gss_nt_service_name,
                               &target_name);
   if (maj_stat != GSS_S_COMPLETE) {
@@ -68,7 +68,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
     return IMAP_AUTH_UNAVAIL;
   }
 #ifdef DEBUG
-  else if (debuglevel >= 2) {
+  else if (DebugLevel >= 2) {
     maj_stat = gss_display_name (&min_stat, target_name, &request_buf,
                                  &mech_name);
     debug_print (2, ("Using service name [%s]\n",
@@ -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);
   }
 
@@ -202,7 +202,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   /* server decides if principal can log in as user */
   strncpy (buf1 + 4, idata->conn->account.user, sizeof (buf1) - 4);
   request_buf.value = buf1;
-  request_buf.length = 4 + str_len (idata->conn->account.user) + 1;
+  request_buf.length = 4 + m_strlen(idata->conn->account.user) + 1;
   maj_stat = gss_wrap (&min_stat, context, 0, GSS_C_QOP_DEFAULT, &request_buf,
                        &cflags, &send_token);
   if (maj_stat != GSS_S_COMPLETE) {
@@ -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? */