# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "mx.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;
method = pop_data->auth_list;
FOREVER {
-#ifdef USE_SASL2
+#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;
if (rc != SASL_CONTINUE)
break;
-#ifdef USE_SASL2
+#ifdef USE_SASL
if (!str_ncmp (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"));
/* 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
}
}
{
char *p1, *p2;
- mem_free (&pop_data->timestamp);
+ p_delete(&pop_data->timestamp);
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
#endif
{pop_auth_apop, "apop"},
{pop_auth_user, "user"},
- {NULL}
+ {NULL, NULL}
};
/*
method = comma;
}
- mem_free (&methods);
+ p_delete(&methods);
}
else {
/* Fall back to default: any authenticator */