lprintf(CTDL_DEBUG, "Performing POP3 cleanup hook\n");
if (POP3->msgs != NULL) free(POP3->msgs);
+
+ free(POP3);
}
void pop3_greeting(void) {
strcpy(CC->cs_clientname, "POP3 session");
CC->internal_pgm = 1;
- CtdlAllocUserData(SYM_POP3, sizeof(struct citpop3));
- POP3->msgs = NULL;
- POP3->num_msgs = 0;
+ POP3 = malloc(sizeof(struct citpop3));
+ memset(POP3, 0, sizeof(struct citpop3));
cprintf("+OK Citadel POP3 server %s\r\n",
CC->cs_nonce);
strcpy(username, argbuf);
striplt(username);
- lprintf(CTDL_DEBUG, "Trying <%s>\n", username);
+ /* lprintf(CTDL_DEBUG, "Trying <%s>\n", username); */
if (CtdlLoginExistingUser(username) == login_ok) {
cprintf("+OK Password required for %s\r\n", username);
}
* metadata record. If so, great; if not, measure it and then cache
* it for next time.
*/
- GetMetaData(&smi, POP3->num_msgs-1);
+ GetMetaData(&smi, msgnum);
if (smi.meta_rfc822_length <= 0L) {
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
POP3->lastseen = (-1);
if (POP3->num_msgs) for (i=0; i<POP3->num_msgs; ++i) {
- if (is_msg_in_mset(vbuf.v_seen,
+ if (is_msg_in_sequence_set(vbuf.v_seen,
(POP3->msgs[POP3->num_msgs-1].msgnum) )) {
POP3->lastseen = i;
}
strcpy(password, argbuf);
striplt(password);
- lprintf(CTDL_DEBUG, "Trying <%s>\n", password);
+ /* lprintf(CTDL_DEBUG, "Trying <%s>\n", password); */
if (CtdlTryPassword(password) == pass_ok) {
pop3_login();
}
ptr = msgtext;
while (ptr = memreadline(ptr, buf, (sizeof buf - 2)),
- ( (*ptr != NULL) && (done == 0))) {
+ ( (*ptr != 0) && (done == 0))) {
strcat(buf, "\r\n");
if (in_body == 1) {
if (lines_dumped >= lines_requested) {
if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
if (POP3->msgs[i].deleted) {
CtdlDeleteMessages(MAILROOM,
- POP3->msgs[i].msgnum, "");
+ POP3->msgs[i].msgnum, "", 1);
}
}
CC->kill_me = 1;
return;
}
- lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+ if (!strncasecmp(cmdbuf, "PASS", 4)) {
+ lprintf(CTDL_INFO, "POP3: PASS...\r\n");
+ }
+ else {
+ lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+ }
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
if (!strncasecmp(cmdbuf, "NOOP", 4)) {