gint last;
if (sscanf(msg, "%d", &last) == 0) {
- log_error(_("POP3 protocol error\n"));
+ log_warning(_("POP3 protocol error\n"));
session->error_val = PS_PROTOCOL;
return -1;
} else {
partial_recv = (gint)g_hash_table_lookup(
session->partial_recv_table, id);
- if (!session->ac_prefs->getall && recv_time != RECV_TIME_NONE
+ if ((!session->ac_prefs->getall && recv_time != RECV_TIME_NONE)
|| partial_recv != POP3_TOTALLY_RECEIVED) {
session->msg[num].received =
(partial_recv != POP3_MUST_COMPLETE_RECV);
session->msg[num].partial_recv = partial_recv;
+
}
if (!session->new_msg_exist &&
(session->ac_prefs->getall || recv_time == RECV_TIME_NONE ||
g_vsnprintf(buf, sizeof(buf) - 2, format, args);
va_end(args);
- if (!strncasecmp(buf, "PASS ", 5))
+ if (!g_ascii_strncasecmp(buf, "PASS ", 5))
log_print("POP3> PASS ********\n");
else
log_print("POP3> %s\n", buf);
recv_time = RECV_TIME_NONE;
partial_recv = POP3_TOTALLY_RECEIVED;
- if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 3) {
+ if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 3) {
if (sscanf(buf, "%s\t%ld", uidl, &recv_time) != 2) {
if (sscanf(buf, "%s", uidl) != 1)
continue;
FILE_OP_ERROR(file, "chmod");
if (prefix != NULL) {
- fprintf(fp, prefix);
+ fprintf(fp, "%s", prefix);
fprintf(fp, "\n");
}
pop3_stls_send(pop3_session);
else
#endif
- if (pop3_session->ac_prefs->protocol == A_APOP)
+ if (pop3_session->ac_prefs->use_apop_auth)
pop3_getauth_apop_send(pop3_session);
else
pop3_getauth_user_send(pop3_session);
case POP3_STLS:
if (pop3_stls_recv(pop3_session) != PS_SUCCESS)
return -1;
- if (pop3_session->ac_prefs->protocol == A_APOP)
+ if (pop3_session->ac_prefs->use_apop_auth)
pop3_getauth_apop_send(pop3_session);
else
pop3_getauth_user_send(pop3_session);