#endif
#include "mutt.h"
+#include "ascii.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
acct->port = POP_PORT;
acct->type = M_ACCT_TYPE_POP;
- c = safe_strdup (path);
+ c = str_dup (path);
url_parse_ciss (&url, c);
if (url.scheme == U_POP || url.scheme == U_POPS) {
ret = 0;
}
- FREE (&c);
+ mem_free (&c);
return ret;
}
t = strchr (pop_data->err_msg, '\0');
c = msg;
- if (!safe_strncmp (msg, "-ERR ", 5)) {
+ if (!str_ncmp (msg, "-ERR ", 5)) {
c2 = msg + 5;
SKIPWS (c2);
char *c;
if (!ascii_strncasecmp (line, "SASL", 4)) {
- FREE (&pop_data->auth_list);
+ mem_free (&pop_data->auth_list);
c = line + 4;
SKIPWS (c);
- pop_data->auth_list = safe_strdup (c);
+ pop_data->auth_list = str_dup (c);
}
else if (!ascii_strncasecmp (line, "STLS", 4))
POP_DATA *pop_data = (POP_DATA *) data;
if (!pop_data->auth_list) {
- pop_data->auth_list = safe_malloc (strlen (line) + 1);
+ pop_data->auth_list = mem_malloc (strlen (line) + 1);
*pop_data->auth_list = '\0';
}
else {
- safe_realloc (&pop_data->auth_list,
+ mem_realloc (&pop_data->auth_list,
strlen (pop_data->auth_list) + strlen (line) + 2);
strcat (pop_data->auth_list, " "); /* __STRCAT_CHECKED__ */
}
pop_data->resp_codes = 0;
pop_data->expire = 1;
pop_data->login_delay = 0;
- FREE (&pop_data->auth_list);
+ mem_free (&pop_data->auth_list);
}
/* Execute CAPA command */
pop_data->status = POP_CONNECTED;
- if (safe_strncmp (buf, "+OK", 3)) {
+ if (str_ncmp (buf, "+OK", 3)) {
*pop_data->err_msg = '\0';
pop_error (pop_data, buf);
mutt_error ("%s", pop_data->err_msg);
return PQ_ERR;
}
-#if (defined(USE_SSL) || defined(USE_GNUTLS)) && !defined(USE_NSS)
+#if (defined(USE_SSL) || defined(USE_GNUTLS))
/* Attempt STLS if available and desired. */
- if (pop_data->cmd_stls && !pop_data->conn->ssf) {
+ if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) {
+ if (option (OPTSSLFORCETLS))
+ pop_data->use_stls = 2;
if (pop_data->use_stls == 0) {
ret = query_quadoption (OPT_SSLSTARTTLS,
_("Secure connection with TLS?"));
}
}
}
+
+ if (option(OPTSSLFORCETLS) && !pop_data->conn->ssf) {
+ mutt_error _("Encrypted connection unavailable");
+ mutt_sleep (1);
+ return -2;
+ }
#endif
ret = pop_authenticate (pop_data);
pop_data->status = POP_DISCONNECTED;
return PQ_NOT_CONNECTED;
}
- if (!safe_strncmp (buf, "+OK", 3))
+ if (!str_ncmp (buf, "+OK", 3))
return PQ_OK;
pop_error (pop_data, buf);
if (ret != PQ_OK)
return ret;
- inbuf = safe_malloc (sizeof (buf));
+ inbuf = mem_malloc (sizeof (buf));
FOREVER {
chunk =
lenbuf = 0;
}
- safe_realloc (&inbuf, lenbuf + sizeof (buf));
+ mem_realloc (&inbuf, lenbuf + sizeof (buf));
}
- FREE (&inbuf);
+ mem_free (&inbuf);
return ret;
}
sscanf (line, "%u %s", &index, line);
for (i = 0; i < ctx->msgcount; i++) {
- if (!safe_strcmp (ctx->hdrs[i]->data, line)) {
+ if (!str_cmp (ctx->hdrs[i]->data, line)) {
ctx->hdrs[i]->refno = index;
break;
}