# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
+
#include "mutt.h"
-#include "ascii.h"
#include "mx.h"
-#include "md5.h"
#include "pop.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
#include <unistd.h>
#ifdef USE_SASL
-#ifdef USE_SASL2
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
-#else
-#include <sasl.h>
-#include <saslutil.h>
-#endif
-
#include "mutt_sasl.h"
#endif
char inbuf[LONG_STRING];
const char *mech;
-#ifdef USE_SASL2
+#ifdef USE_SASL
const char *pc = NULL;
-#else
- char *pc = NULL;
#endif
unsigned int len, olen;
unsigned char client_start;
if (!method)
method = pop_data->auth_list;
- FOREVER {
-#ifdef USE_SASL2
+ for (;;) {
+#ifdef USE_SASL
rc =
sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech);
-#else
- rc = sasl_client_start (saslconn, method, NULL,
- &interaction, &pc, &olen, &mech);
#endif
if (rc != SASL_INTERACT)
break;
olen = strlen (buf);
/* looping protocol */
- FOREVER {
- strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
+ for (;;) {
+ m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n");
mutt_socket_write (pop_data->conn, buf);
if (mutt_socket_readln (inbuf, sizeof (inbuf), pop_data->conn) < 0) {
sasl_dispose (&saslconn);
if (rc != SASL_CONTINUE)
break;
-#ifdef USE_SASL2
- if (!str_ncmp (inbuf, "+ ", 2)
+#ifdef USE_SASL
+ if (!m_strncmp(inbuf, "+ ", 2)
&& sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
&len) != SASL_OK)
-#else
- if (!str_ncmp (inbuf, "+ ", 2)
- && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK)
#endif
{
debug_print (1, ("error base64-decoding server response.\n"));
}
if (!client_start)
- FOREVER {
+ for (;;) {
rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
if (rc != SASL_INTERACT)
break;
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
-#ifndef USE_SASL2
- mem_free (&pc);
+#ifndef USE_SASL
+ p_delete(&pc);
#endif
}
}
if (rc != SASL_OK)
goto bail;
- if (!str_ncmp (inbuf, "+OK", 3)) {
+ if (!m_strncmp(inbuf, "+OK", 3)) {
mutt_sasl_setup_conn (pop_data->conn, saslconn);
return POP_A_SUCCESS;
}
sasl_dispose (&saslconn);
/* terminate SASL sessoin if the last responce is not +OK nor -ERR */
- if (!str_ncmp (inbuf, "+ ", 2)) {
+ if (!m_strncmp(inbuf, "+ ", 2)) {
snprintf (buf, sizeof (buf), "*\r\n");
if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED)
return POP_A_SOCKET;
{
char *p1, *p2;
- mem_free (&pop_data->timestamp);
+ p_delete(&pop_data->timestamp);
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
- pop_data->timestamp = str_dup (p1);
+ pop_data->timestamp = m_strdup(p1);
}
}
#endif
{pop_auth_apop, "apop"},
{pop_auth_user, "user"},
- {NULL}
+ {NULL, NULL}
};
/*
if (PopAuthenticators && *PopAuthenticators) {
/* Try user-specified list of authentication methods */
- methods = str_dup (PopAuthenticators);
+ methods = m_strdup(PopAuthenticators);
method = methods;
while (method) {
method = comma;
}
- mem_free (&methods);
+ p_delete(&methods);
}
else {
/* Fall back to default: any authenticator */