projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pop
/
pop_auth.c
diff --git
a/pop/pop_auth.c
b/pop/pop_auth.c
index
840f9e8
..
75fe93c
100644
(file)
--- a/
pop/pop_auth.c
+++ b/
pop/pop_auth.c
@@
-12,6
+12,7
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
#include "mx.h"
#include "md5.h"
#include "pop.h"
#include "mx.h"
#include "md5.h"
#include "pop.h"
@@
-24,14
+25,8
@@
#include <unistd.h>
#ifdef USE_SASL
#include <unistd.h>
#ifdef USE_SASL
-#ifdef USE_SASL2
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
-#else
-#include <sasl.h>
-#include <saslutil.h>
-#endif
-
#include "mutt_sasl.h"
#endif
#include "mutt_sasl.h"
#endif
@@
-46,10
+41,8
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
char inbuf[LONG_STRING];
const char *mech;
char inbuf[LONG_STRING];
const char *mech;
-#ifdef USE_SASL
2
+#ifdef USE_SASL
const char *pc = NULL;
const char *pc = NULL;
-#else
- char *pc = NULL;
#endif
unsigned int len, olen;
unsigned char client_start;
#endif
unsigned int len, olen;
unsigned char client_start;
@@
-63,12
+56,9
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
method = pop_data->auth_list;
FOREVER {
method = pop_data->auth_list;
FOREVER {
-#ifdef USE_SASL
2
+#ifdef USE_SASL
rc =
sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech);
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;
#endif
if (rc != SASL_INTERACT)
break;
@@
-102,13
+92,10
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
if (rc != SASL_CONTINUE)
break;
if (rc != SASL_CONTINUE)
break;
-#ifdef USE_SASL
2
- if (!s
afe_str
ncmp (inbuf, "+ ", 2)
+#ifdef USE_SASL
+ if (!s
tr_
ncmp (inbuf, "+ ", 2)
&& sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
&len) != SASL_OK)
&& sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
&len) != SASL_OK)
-#else
- if (!safe_strncmp (inbuf, "+ ", 2)
- && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK)
#endif
{
debug_print (1, ("error base64-decoding server response.\n"));
#endif
{
debug_print (1, ("error base64-decoding server response.\n"));
@@
-137,8
+124,8
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
-#ifndef USE_SASL
2
-
FREE
(&pc);
+#ifndef USE_SASL
+
mem_free
(&pc);
#endif
}
}
#endif
}
}
@@
-146,7
+133,7
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
if (rc != SASL_OK)
goto bail;
if (rc != SASL_OK)
goto bail;
- if (!s
afe_str
ncmp (inbuf, "+OK", 3)) {
+ if (!s
tr_
ncmp (inbuf, "+OK", 3)) {
mutt_sasl_setup_conn (pop_data->conn, saslconn);
return POP_A_SUCCESS;
}
mutt_sasl_setup_conn (pop_data->conn, saslconn);
return POP_A_SUCCESS;
}
@@
-155,7
+142,7
@@
bail:
sasl_dispose (&saslconn);
/* terminate SASL sessoin if the last responce is not +OK nor -ERR */
sasl_dispose (&saslconn);
/* terminate SASL sessoin if the last responce is not +OK nor -ERR */
- if (!s
afe_str
ncmp (inbuf, "+ ", 2)) {
+ if (!s
tr_
ncmp (inbuf, "+ ", 2)) {
snprintf (buf, sizeof (buf), "*\r\n");
if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED)
return POP_A_SOCKET;
snprintf (buf, sizeof (buf), "*\r\n");
if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED)
return POP_A_SOCKET;
@@
-174,11
+161,11
@@
void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
{
char *p1, *p2;
{
char *p1, *p2;
-
FREE
(&pop_data->timestamp);
+
mem_free
(&pop_data->timestamp);
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
- pop_data->timestamp = s
afe_str
dup (p1);
+ pop_data->timestamp = s
tr_
dup (p1);
}
}
}
}
@@
-216,10
+203,13
@@
static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
return POP_A_SUCCESS;
case PQ_NOT_CONNECTED:
return POP_A_SOCKET;
return POP_A_SUCCESS;
case PQ_NOT_CONNECTED:
return POP_A_SOCKET;
+ case PFD_FUNCT_ERROR:
+ case PQ_ERR:
+ default:
+ break;
}
}
- mutt_error _("APOP authentication failed.");
-
+ mutt_error ("%s %s", _("APOP authentication failed."), pop_data->err_msg);
mutt_sleep (2);
return POP_A_FAILURE;
mutt_sleep (2);
return POP_A_FAILURE;
@@
-270,6
+260,10
@@
static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
return POP_A_SUCCESS;
case PQ_NOT_CONNECTED:
return POP_A_SOCKET;
return POP_A_SUCCESS;
case PQ_NOT_CONNECTED:
return POP_A_SOCKET;
+ case PFD_FUNCT_ERROR:
+ case PQ_ERR:
+ default:
+ break;
}
mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);
}
mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);
@@
-310,7
+304,7
@@
pop_query_status pop_authenticate (POP_DATA * pop_data)
if (PopAuthenticators && *PopAuthenticators) {
/* Try user-specified list of authentication methods */
if (PopAuthenticators && *PopAuthenticators) {
/* Try user-specified list of authentication methods */
- methods = s
afe_str
dup (PopAuthenticators);
+ methods = s
tr_
dup (PopAuthenticators);
method = methods;
while (method) {
method = methods;
while (method) {
@@
-349,7
+343,7
@@
pop_query_status pop_authenticate (POP_DATA * pop_data)
method = comma;
}
method = comma;
}
-
FREE
(&methods);
+
mem_free
(&methods);
}
else {
/* Fall back to default: any authenticator */
}
else {
/* Fall back to default: any authenticator */