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

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index f80f506..e5f1bce 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",
@@ -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) {