#include "imap_private.h"
#include "auth.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <netinet/in.h>
/* 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 = safe_strlen (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) {
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",
mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length,
sizeof (buf1) - 2);
gss_release_buffer (&min_stat, &send_token);
- safe_strcat (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) {
mutt_to_base64 ((unsigned char *) buf1, send_token.value,
send_token.length, sizeof (buf1) - 2);
gss_release_buffer (&min_stat, &send_token);
- safe_strcat (buf1, sizeof (buf1), "\r\n");
+ m_strcat(buf1, sizeof(buf1), "\r\n");
mutt_socket_write (idata->conn, buf1);
}
/* 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 + safe_strlen (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) {
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));
- safe_strcat (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? */