X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=961e9acb8f111cb8591193079d00f767593555f8;hb=a2a06e5d6767d0e45eeccf4032153764e8a5520f;hp=36c5fbb2ded471f7da741d669f94e79e68dd5dd0;hpb=11219dbc3e638e7ee47feffbbb7d63588d7dd77f;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 36c5fbb2d..961e9acb8 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include "citadel.h" #include "server.h" #include "serv_extensions.h" @@ -47,20 +49,18 @@ #include "html.h" #include "genstamp.h" #include "internet_addressing.h" -#include "serv_fulltext.h" #include "vcard.h" #include "euidindex.h" #include "journaling.h" #include "citadel_dirs.h" -#include "serv_network.h" -#ifdef HAVE_LIBSIEVE -# include "serv_sieve.h" -#endif /* HAVE_LIBSIEVE */ long config_msgnum; struct addresses_to_be_filed *atbf = NULL; +/* This temp file holds the queue of operations for AdjRefCount() */ +static FILE *arcfp = NULL; + /* * This really belongs in serv_network.c, but I don't know how to export * symbols between modules. @@ -145,6 +145,9 @@ int alias(char *name) char testnode[64]; char buf[SIZ]; + char original_name[256]; + safestrncpy(original_name, name, sizeof original_name); + striplt(name); remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); stripallbut(name, '<', '>'); @@ -179,7 +182,9 @@ int alias(char *name) strcpy(name, aaa); } - lprintf(CTDL_INFO, "Mail is being forwarded to %s\n", name); + if (strcasecmp(original_name, name)) { + lprintf(CTDL_INFO, "%s is being forwarded to %s\n", original_name, name); + } /* Change "user @ xxx" to "user" if xxx is an alias for this host */ for (a=0; auser, CC->curr_user); CtdlGetRelationship(&vbuf, &CC->user, &CC->room); @@ -544,6 +545,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, num_msgs = cdbfr->len / sizeof(long); cdb_free(cdbfr); } else { + if (need_to_free_re) regfree(&re); return 0; /* No messages at all? No further action. */ } @@ -556,7 +558,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, /* If the caller is looking for a specific MIME type, filter * out all messages which are not of the type requested. */ - if (content_type != NULL) if (strlen(content_type) > 0) { + if (content_type != NULL) if (!IsEmptyStr(content_type)) { /* This call to GetMetaData() sits inside this loop * so that we only do the extra database read per msg @@ -569,7 +571,8 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, */ GetMetaData(&smi, msglist[a]); - if (strcasecmp(smi.meta_content_type, content_type)) { + /* if (strcasecmp(smi.meta_content_type, content_type)) { old non-regex way */ + if (regexec(&re, smi.meta_content_type, 1, &pm, 0) != 0) { msglist[a] = 0L; } } @@ -606,7 +609,13 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, * over again. */ if ( (num_msgs > 0) && (mode == MSGS_SEARCH) && (search_string) ) { - ft_search(&num_search_msgs, &search_msgs, search_string); + + /* Call search module via hook mechanism. + * NULL means use any search function available. + * otherwise replace with a char * to name of search routine + */ + CtdlModuleDoSearch(&num_search_msgs, &search_msgs, search_string, "fulltext"); + if (num_search_msgs > 0) { int orig_num_msgs; @@ -671,6 +680,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, } } free(msglist); /* Clean up */ + if (need_to_free_re) regfree(&re); return num_processed; } @@ -734,6 +744,9 @@ void cmd_msgs(char *cmdbuf) template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); memset(template, 0, sizeof(struct CtdlMessage)); + template->cm_magic = CTDLMESSAGE_MAGIC; + template->cm_anon_type = MES_NORMAL; + while(client_getln(buf, sizeof buf), strcmp(buf,"000")) { extract_token(tfield, buf, 0, '|', sizeof tfield); extract_token(tvalue, buf, 1, '|', sizeof tvalue); @@ -984,7 +997,7 @@ void mime_spew_section(char *name, char *filename, char *partnum, char *disp, *found_it = 1; - cprintf("%d %d\n", BINARY_FOLLOWS, length); + cprintf("%d %d\n", BINARY_FOLLOWS, (int)length); client_write(content, length); } @@ -1101,7 +1114,11 @@ void CtdlFreeMessage(struct CtdlMessage *msg) { int i; - if (is_valid_message(msg) == 0) return; + if (is_valid_message(msg) == 0) + { + if (msg != NULL) free (msg); + return; + } for (i = 0; i < 256; ++i) if (msg->cm_fields[i] != NULL) { @@ -1190,7 +1207,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp, ma->did_print = 1; if ( (!strcasecmp(cbtype, "text/plain")) - || (strlen(cbtype)==0) ) { + || (IsEmptyStr(cbtype)) ) { wptr = content; if (length > 0) { client_write(wptr, length); @@ -1250,7 +1267,6 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, if (ma->is_ma > 0) { for (i=0; ipreferred_formats, '|'); ++i) { extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); - lprintf(CTDL_DEBUG, "Is <%s> == <%s> ??\n", buf, cbtype); if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) { if (i < ma->chosen_pref) { safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part); @@ -1291,19 +1307,19 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, if (text_content[length-1] != '\n') { ++add_newline; } - cprintf("Content-type: %s", cbtype); - if (strlen(cbcharset) > 0) { + if (!IsEmptyStr(cbcharset)) { cprintf("; charset=%s", cbcharset); } cprintf("\nContent-length: %d\n", (int)(length + add_newline) ); - if (strlen(encoding) > 0) { + if (!IsEmptyStr(encoding)) { cprintf("Content-transfer-encoding: %s\n", encoding); } else { cprintf("Content-transfer-encoding: 7bit\n"); } + cprintf("X-Citadel-MSG4-Partnum: %s\n", partnum); cprintf("\n"); client_write(content, length); if (add_newline) cprintf("\n"); @@ -1398,7 +1414,7 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ /* Here is the weird form of this command, to process only an * encapsulated message/rfc822 section. */ - if (section) if (strlen(section)>0) if (strcmp(section, "0")) { + if (section) if (!IsEmptyStr(section)) if (strcmp(section, "0")) { memset(&encap, 0, sizeof encap); safestrncpy(encap.desired_section, section, sizeof encap.desired_section); mime_parser(TheMessage->cm_fields['M'], @@ -1589,7 +1605,7 @@ int CtdlOutputPreLoadedMsg( */ suppress_f = 0; if (TheMessage->cm_fields['N'] != NULL) - if (strlen(TheMessage->cm_fields['N']) > 0) + if (!IsEmptyStr(TheMessage->cm_fields['N'])) if (haschar(TheMessage->cm_fields['N'], '.') == 0) { suppress_f = 1; } @@ -1737,30 +1753,40 @@ START_TEXT: ++start_of_text; start_of_text = strstr(start_of_text, "\n"); ++start_of_text; + + char outbuf[1024]; + int outlen = 0; + int nllen = strlen(nl); while (ch=*mptr, ch!=0) { if (ch==13) { /* do nothing */ } - else switch(headers_only) { - case HEADERS_NONE: - if (mptr >= start_of_text) { - if (ch == 10) cprintf("%s", nl); - else cprintf("%c", ch); + else { + if ( + ((headers_only == HEADERS_NONE) && (mptr >= start_of_text)) + || ((headers_only == HEADERS_ONLY) && (mptr < start_of_text)) + || ((headers_only != HEADERS_NONE) && (headers_only != HEADERS_ONLY)) + ) { + if (ch == 10) { + sprintf(&outbuf[outlen], "%s", nl); + outlen += nllen; } - break; - case HEADERS_ONLY: - if (mptr < start_of_text) { - if (ch == 10) cprintf("%s", nl); - else cprintf("%c", ch); + else { + outbuf[outlen++] = ch; } - break; - default: - if (ch == 10) cprintf("%s", nl); - else cprintf("%c", ch); - break; + } } ++mptr; + if (outlen > 1000) { + client_write(outbuf, outlen); + outlen = 0; + } + } + if (outlen > 0) { + client_write(outbuf, outlen); + outlen = 0; } + goto DONE; } } @@ -1794,7 +1820,7 @@ START_TEXT: buf[strlen(buf)] = ch; } } - if (strlen(buf) > 0) + if (!IsEmptyStr(buf)) cprintf("%s%s", buf, nl); } @@ -1884,7 +1910,7 @@ void cmd_msg2(char *cmdbuf) void cmd_msg3(char *cmdbuf) { long msgnum; - struct CtdlMessage *msg; + struct CtdlMessage *msg = NULL; struct ser_ret smr; if (CC->internal_pgm == 0) { @@ -2118,15 +2144,8 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n"); } - /* Submit this room for net processing */ - network_queue_room(&CC->room, NULL); - -#ifdef HAVE_LIBSIEVE - /* If this is someone's inbox, submit the room for sieve processing */ - if (!strcasecmp(&CC->room.QRname[11], MAILROOM)) { - sieve_queue_room(&CC->room); - } -#endif /* HAVE_LIBSIEVE */ + /* Submit this room for processing by hooks */ + PerformRoomHooks(&CC->room); /* Go back to the room we were in before we wandered here... */ getroom(&CC->room, hold_rm); @@ -2306,14 +2325,14 @@ void ReplicationChecks(struct CtdlMessage *msg) { /* No exclusive id? Don't do anything. */ if (msg == NULL) return; if (msg->cm_fields['E'] == NULL) return; - if (strlen(msg->cm_fields['E']) == 0) return; + if (IsEmptyStr(msg->cm_fields['E'])) return; /*lprintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n", msg->cm_fields['E'], CC->room.QRname);*/ old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CC->room); if (old_msgnum > 0L) { lprintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); - CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, "", 0); + CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, ""); } } @@ -2341,7 +2360,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ FILE *network_fp = NULL; static int seqnum = 1; struct CtdlMessage *imsg = NULL; - char *instr; + char *instr = NULL; + size_t instr_alloc = 0; struct ser_ret smr; char *hold_R, *hold_D; char *collected_addresses = NULL; @@ -2398,10 +2418,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ break; case 4: strcpy(content_type, "text/plain"); - mptr = bmstrcasestr(msg->cm_fields['M'], "Content-type: "); + mptr = bmstrcasestr(msg->cm_fields['M'], "Content-type:"); if (mptr != NULL) { - safestrncpy(content_type, &mptr[14], - sizeof content_type); + safestrncpy(content_type, &mptr[13], sizeof content_type); + striplt(content_type); for (a = 0; a < strlen(content_type); ++a) { if ((content_type[a] == ';') || (content_type[a] == ' ') @@ -2431,7 +2451,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* ...or if this message is destined for Aide> then go there. */ - if (strlen(force_room) > 0) { + if (!IsEmptyStr(force_room)) { strcpy(actual_rm, force_room); } @@ -2549,10 +2569,36 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ lprintf(CTDL_DEBUG, "Delivering private local mail to <%s>\n", recipient); if (getuser(&userbuf, recipient) == 0) { - MailboxName(actual_rm, sizeof actual_rm, - &userbuf, MAILROOM); + // Add a flag so the Funambol module knows its mail + msg->cm_fields['W'] = strdup(recipient); + MailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg); BumpNewMailCounter(userbuf.usernum); + if (!IsEmptyStr(config.c_funambol_host)) { + /* Generate a instruction message for the Funambol notification + * server, in the same style as the SMTP queue + */ + instr_alloc = 1024; + instr = malloc(instr_alloc); + snprintf(instr, instr_alloc, + "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n" + "bounceto|%s@%s\n", + SPOOLMIME, newmsgid, (long)time(NULL), + msg->cm_fields['A'], msg->cm_fields['N'] + ); + + imsg = malloc(sizeof(struct CtdlMessage)); + memset(imsg, 0, sizeof(struct CtdlMessage)); + imsg->cm_magic = CTDLMESSAGE_MAGIC; + imsg->cm_anon_type = MES_NORMAL; + imsg->cm_format_type = FMT_RFC822; + imsg->cm_fields['A'] = strdup("Citadel"); + imsg->cm_fields['J'] = strdup("do not journal"); + imsg->cm_fields['M'] = instr; /* imsg owns this memory now */ + imsg->cm_fields['W'] = strdup(recipient); + CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM); + CtdlFreeMessage(imsg); + } } else { lprintf(CTDL_DEBUG, "No user <%s>\n", recipient); @@ -2609,7 +2655,6 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Go back to the room we started from */ lprintf(CTDL_DEBUG, "Returning to original room %s\n", hold_rm); if (strcasecmp(hold_rm, CC->room.QRname)) - /* getroom(&CC->room, hold_rm); */ usergoto(hold_rm, 0, 1, NULL, NULL); /* For internet mail, generate delivery instructions. @@ -2620,8 +2665,9 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (recps != NULL) if (recps->num_internet > 0) { lprintf(CTDL_DEBUG, "Generating delivery instructions\n"); - instr = malloc(SIZ * 2); - snprintf(instr, SIZ * 2, + instr_alloc = 1024; + instr = malloc(instr_alloc); + snprintf(instr, instr_alloc, "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n" "bounceto|%s@%s\n", SPOOLMIME, newmsgid, (long)time(NULL), @@ -2630,10 +2676,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_internet, '|'); ++i) { size_t tmp = strlen(instr); - extract_token(recipient, recps->recp_internet, - i, '|', sizeof recipient); - snprintf(&instr[tmp], SIZ * 2 - tmp, - "remote|%s|0||\n", recipient); + extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient); + if ((tmp + strlen(recipient) + 32) > instr_alloc) { + instr_alloc = instr_alloc * 2; + instr = realloc(instr, instr_alloc); + } + snprintf(&instr[tmp], instr_alloc - tmp, "remote|%s|0||\n", recipient); } imsg = malloc(sizeof(struct CtdlMessage)); @@ -2643,7 +2691,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ imsg->cm_format_type = FMT_RFC822; imsg->cm_fields['A'] = strdup("Citadel"); imsg->cm_fields['J'] = strdup("do not journal"); - imsg->cm_fields['M'] = instr; + imsg->cm_fields['M'] = instr; /* imsg owns this memory now */ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM); CtdlFreeMessage(imsg); } @@ -2750,7 +2798,7 @@ void quickie_message(char *from, char *fromaddr, char *to, char *room, char *tex CtdlSubmitMsg(msg, recp, room); CtdlFreeMessage(msg); - if (recp != NULL) free(recp); + if (recp != NULL) free_recipients(recp); } @@ -2869,13 +2917,15 @@ struct CtdlMessage *CtdlMakeMessage( int type, /* see MES_ types in header file */ int format_type, /* variformat, plain text, MIME... */ char *fake_name, /* who we're masquerading as */ + char *my_email, /* which of my email addresses to use (empty is ok) */ char *subject, /* Subject (optional) */ char *supplied_euid, /* ...or NULL if this is irrelevant */ char *preformatted_text /* ...or NULL to read text from client */ ) { - char dest_node[SIZ]; - char buf[SIZ]; + char dest_node[256]; + char buf[1024]; struct CtdlMessage *msg; + int i; msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); @@ -2889,8 +2939,21 @@ struct CtdlMessage *CtdlMakeMessage( striplt(recipient); striplt(recp_cc); - snprintf(buf, sizeof buf, "cit%ld", author->usernum); /* Path */ - msg->cm_fields['P'] = strdup(buf); + /* Path or Return-Path */ + if (my_email == NULL) my_email = ""; + + if (!IsEmptyStr(my_email)) { + msg->cm_fields['P'] = strdup(my_email); + } + else { + snprintf(buf, sizeof buf, "%s", author->fullname); + msg->cm_fields['P'] = strdup(buf); + } + for (i=0; (msg->cm_fields['P'][i]!=0); ++i) { + if (isspace(msg->cm_fields['P'][i])) { + msg->cm_fields['P'][i] = '_'; + } + } snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */ msg->cm_fields['T'] = strdup(buf); @@ -2920,14 +2983,32 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_fields['D'] = strdup(dest_node); } - if ( (author == &CC->user) && (strlen(CC->cs_inet_email) > 0) ) { + if (!IsEmptyStr(my_email)) { + msg->cm_fields['F'] = strdup(my_email); + } + else if ( (author == &CC->user) && (!IsEmptyStr(CC->cs_inet_email)) ) { msg->cm_fields['F'] = strdup(CC->cs_inet_email); } if (subject != NULL) { + long length; striplt(subject); - if (strlen(subject) > 0) { - msg->cm_fields['U'] = strdup(subject); + length = strlen(subject); + if (length > 0) { + long i; + long IsAscii; + IsAscii = -1; + i = 0; + while ((subject[i] != '\0') && + (IsAscii = isascii(subject[i]) != 0 )) + i++; + if (IsAscii != 0) + msg->cm_fields['U'] = strdup(subject); + else /* ok, we've got utf8 in the string. */ + { + msg->cm_fields['U'] = rfc2047encode(subject, length); + } + } } @@ -2939,8 +3020,7 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_fields['M'] = preformatted_text; } else { - msg->cm_fields['M'] = CtdlReadMessageBody("000", - config.c_maxmsglen, NULL, 0); + msg->cm_fields['M'] = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0); } return(msg); @@ -2953,6 +3033,7 @@ struct CtdlMessage *CtdlMakeMessage( * returns 0 on success. */ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, size_t n) { + int ra; if (!(CC->logged_in)) { snprintf(errmsgbuf, n, "Not logged in."); @@ -2966,15 +3047,9 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, size_t n) { return (ERROR + HIGHER_ACCESS_REQUIRED); } - if ((CC->user.axlevel < 4) - && (CC->room.QRflags & QR_NETWORK)) { - snprintf(errmsgbuf, n, "Need net privileges to enter here."); - return (ERROR + HIGHER_ACCESS_REQUIRED); - } - - if ((CC->user.axlevel < 6) - && (CC->room.QRflags & QR_READONLY)) { - snprintf(errmsgbuf, n, "Sorry, this is a read-only room."); + CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL); + if (!(ra & UA_POSTALLOWED)) { + snprintf(errmsgbuf, n, "Higher access is required to post in this room."); return (ERROR + HIGHER_ACCESS_REQUIRED); } @@ -3009,13 +3084,15 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) { /* * Validate recipients, count delivery types and errors, and handle aliasing * FIXME check for dupes!!!!! + * * Returns 0 if all addresses are ok, ret->num_error = -1 if no addresses * were specified, or the number of addresses found invalid. - * caller needs to free the result. + * + * Caller needs to free the result using free_recipients() */ struct recptypes *validate_recipients(char *supplied_recipients) { struct recptypes *ret; - char recipients[SIZ]; + char *recipients = NULL; char this_recp[256]; char this_recp_cooked[256]; char append[SIZ]; @@ -3030,21 +3107,38 @@ struct recptypes *validate_recipients(char *supplied_recipients) { /* Initialize */ ret = (struct recptypes *) malloc(sizeof(struct recptypes)); if (ret == NULL) return(NULL); - memset(ret, 0, sizeof(struct recptypes)); - ret->num_local = 0; - ret->num_internet = 0; - ret->num_ignet = 0; - ret->num_error = 0; - ret->num_room = 0; + /* Set all strings to null and numeric values to zero */ + memset(ret, 0, sizeof(struct recptypes)); if (supplied_recipients == NULL) { - strcpy(recipients, ""); + recipients = strdup(""); } else { - safestrncpy(recipients, supplied_recipients, sizeof recipients); + recipients = strdup(supplied_recipients); } + /* Allocate some memory. Yes, this allocates 500% more memory than we will + * actually need, but it's healthier for the heap than doing lots of tiny + * realloc() calls instead. + */ + + ret->errormsg = malloc(strlen(recipients) + 1024); + ret->recp_local = malloc(strlen(recipients) + 1024); + ret->recp_internet = malloc(strlen(recipients) + 1024); + ret->recp_ignet = malloc(strlen(recipients) + 1024); + ret->recp_room = malloc(strlen(recipients) + 1024); + ret->display_recp = malloc(strlen(recipients) + 1024); + + ret->errormsg[0] = 0; + ret->recp_local[0] = 0; + ret->recp_internet[0] = 0; + ret->recp_ignet[0] = 0; + ret->recp_room[0] = 0; + ret->display_recp[0] = 0; + + ret->recptypes_magic = RECPTYPES_MAGIC; + /* Change all valid separator characters to commas */ for (i=0; i 0) { + while (!IsEmptyStr(recipients)) { for (i=0; i<=strlen(recipients); ++i) { if (recipients[i] == '\"') in_quotes = 1 - in_quotes; @@ -3091,7 +3185,7 @@ struct recptypes *validate_recipients(char *supplied_recipients) { if (!strcasecmp(this_recp, "sysop")) { ++ret->num_room; strcpy(this_recp, config.c_aideroom); - if (strlen(ret->recp_room) > 0) { + if (!IsEmptyStr(ret->recp_room)) { strcat(ret->recp_room, "|"); } strcat(ret->recp_room, this_recp); @@ -3099,7 +3193,7 @@ struct recptypes *validate_recipients(char *supplied_recipients) { else if (getuser(&tempUS, this_recp) == 0) { ++ret->num_local; strcpy(this_recp, tempUS.fullname); - if (strlen(ret->recp_local) > 0) { + if (!IsEmptyStr(ret->recp_local)) { strcat(ret->recp_local, "|"); } strcat(ret->recp_local, this_recp); @@ -3107,7 +3201,7 @@ struct recptypes *validate_recipients(char *supplied_recipients) { else if (getuser(&tempUS, this_recp_cooked) == 0) { ++ret->num_local; strcpy(this_recp, tempUS.fullname); - if (strlen(ret->recp_local) > 0) { + if (!IsEmptyStr(ret->recp_local)) { strcat(ret->recp_local, "|"); } strcat(ret->recp_local, this_recp); @@ -3115,7 +3209,7 @@ struct recptypes *validate_recipients(char *supplied_recipients) { else if ( (!strncasecmp(this_recp, "room_", 5)) && (!getroom(&tempQR, &this_recp_cooked[5])) ) { ++ret->num_room; - if (strlen(ret->recp_room) > 0) { + if (!IsEmptyStr(ret->recp_room)) { strcat(ret->recp_room, "|"); } strcat(ret->recp_room, &this_recp_cooked[5]); @@ -3132,13 +3226,13 @@ struct recptypes *validate_recipients(char *supplied_recipients) { * because if the address were valid, we would have * already translated it to a local address by now. */ - if (IsDirectory(this_recp)) { + if (IsDirectory(this_recp, 0)) { ++ret->num_error; invalid = 1; } else { ++ret->num_internet; - if (strlen(ret->recp_internet) > 0) { + if (!IsEmptyStr(ret->recp_internet)) { strcat(ret->recp_internet, "|"); } strcat(ret->recp_internet, this_recp); @@ -3146,7 +3240,7 @@ struct recptypes *validate_recipients(char *supplied_recipients) { break; case MES_IGNET: ++ret->num_ignet; - if (strlen(ret->recp_ignet) > 0) { + if (!IsEmptyStr(ret->recp_ignet)) { strcat(ret->recp_ignet, "|"); } strcat(ret->recp_ignet, this_recp); @@ -3157,26 +3251,24 @@ struct recptypes *validate_recipients(char *supplied_recipients) { break; } if (invalid) { - if (strlen(ret->errormsg) == 0) { + if (IsEmptyStr(ret->errormsg)) { snprintf(append, sizeof append, "Invalid recipient: %s", this_recp); } else { - snprintf(append, sizeof append, - ", %s", this_recp); + snprintf(append, sizeof append, ", %s", this_recp); } if ( (strlen(ret->errormsg) + strlen(append)) < SIZ) { strcat(ret->errormsg, append); } } else { - if (strlen(ret->display_recp) == 0) { + if (IsEmptyStr(ret->display_recp)) { strcpy(append, this_recp); } else { - snprintf(append, sizeof append, ", %s", - this_recp); + snprintf(append, sizeof append, ", %s", this_recp); } if ( (strlen(ret->display_recp)+strlen(append)) < SIZ) { strcat(ret->display_recp, append); @@ -3197,10 +3289,35 @@ struct recptypes *validate_recipients(char *supplied_recipients) { lprintf(CTDL_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); lprintf(CTDL_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); + free(recipients); return(ret); } +/* + * Destructor for struct recptypes + */ +void free_recipients(struct recptypes *valid) { + + if (valid == NULL) { + return; + } + + if (valid->recptypes_magic != RECPTYPES_MAGIC) { + lprintf(CTDL_EMERG, "Attempt to call free_recipients() on some other data type!\n"); + abort(); + } + + if (valid->errormsg != NULL) free(valid->errormsg); + if (valid->recp_local != NULL) free(valid->recp_local); + if (valid->recp_internet != NULL) free(valid->recp_internet); + if (valid->recp_ignet != NULL) free(valid->recp_ignet); + if (valid->recp_room != NULL) free(valid->recp_room); + if (valid->display_recp != NULL) free(valid->display_recp); + free(valid); +} + + /* * message entry - mode 0 (normal) @@ -3212,10 +3329,10 @@ void cmd_ent0(char *entargs) char cc[SIZ]; char bcc[SIZ]; char supplied_euid[128]; - char masquerade_as[SIZ]; int anon_flag = 0; int format_type = 0; - char newusername[SIZ]; + char newusername[256]; + char newuseremail[256]; struct CtdlMessage *msg; int anonymous = 0; char errmsg[SIZ]; @@ -3225,8 +3342,12 @@ void cmd_ent0(char *entargs) struct recptypes *valid_cc = NULL; struct recptypes *valid_bcc = NULL; char subject[SIZ]; + int subject_required = 0; int do_confirm = 0; long msgnum; + int i, j; + char buf[256]; + int newuseremail_ok = 0; unbuffer_output(); @@ -3235,6 +3356,7 @@ void cmd_ent0(char *entargs) anon_flag = extract_int(entargs, 2); format_type = extract_int(entargs, 3); extract_token(subject, entargs, 4, '|', sizeof subject); + extract_token(newusername, entargs, 5, '|', sizeof newusername); do_confirm = extract_int(entargs, 6); extract_token(cc, entargs, 7, '|', sizeof cc); extract_token(bcc, entargs, 8, '|', sizeof bcc); @@ -3247,39 +3369,72 @@ void cmd_ent0(char *entargs) supplied_euid[0] = 0; break; } + extract_token(newuseremail, entargs, 10, '|', sizeof newuseremail); /* first check to make sure the request is valid. */ err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, sizeof errmsg); - if (err) { + if (err) + { cprintf("%d %s\n", err, errmsg); return; } /* Check some other permission type things. */ - if (post == 2) { - if (CC->user.axlevel < 6) { - cprintf("%d You don't have permission to masquerade.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return; + if (IsEmptyStr(newusername)) { + strcpy(newusername, CC->user.fullname); + } + if ( (CC->user.axlevel < 6) + && (strcasecmp(newusername, CC->user.fullname)) + && (strcasecmp(newusername, CC->cs_inet_fn)) + ) { + cprintf("%d You don't have permission to author messages as '%s'.\n", + ERROR + HIGHER_ACCESS_REQUIRED, + newusername + ); + return; + } + + + if (IsEmptyStr(newuseremail)) { + newuseremail_ok = 1; + } + + if (!IsEmptyStr(newuseremail)) { + if (!strcasecmp(newuseremail, CC->cs_inet_email)) { + newuseremail_ok = 1; + } + else if (!IsEmptyStr(CC->cs_inet_other_emails)) { + j = num_tokens(CC->cs_inet_other_emails, '|'); + for (i=0; ics_inet_other_emails, i, '|', sizeof buf); + if (!strcasecmp(newuseremail, buf)) { + newuseremail_ok = 1; + } + } } - extract_token(newusername, entargs, 5, '|', sizeof newusername); - memset(CC->fake_postname, 0, sizeof(CC->fake_postname) ); - safestrncpy(CC->fake_postname, newusername, - sizeof(CC->fake_postname) ); - cprintf("%d ok\n", CIT_OK); + } + + if (!newuseremail_ok) { + cprintf("%d You don't have permission to author messages as '%s'.\n", + ERROR + HIGHER_ACCESS_REQUIRED, + newuseremail + ); return; } + CC->cs_flags |= CS_POSTING; - /* In the Mail> room we have to behave a little differently -- + /* In mailbox rooms we have to behave a little differently -- * make sure the user has specified at least one recipient. Then - * validate the recipient(s). + * validate the recipient(s). We do this for the Mail> room, as + * well as any room which has the "Mailbox" view set. */ - if ( (CC->room.QRflags & QR_MAILBOX) - && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) ) { + if ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) ) + || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) ) + ) { if (CC->user.axlevel < 2) { strcpy(recp, "sysop"); strcpy(cc, ""); @@ -3289,32 +3444,32 @@ void cmd_ent0(char *entargs) valid_to = validate_recipients(recp); if (valid_to->num_error > 0) { cprintf("%d Invalid recipient (To)\n", ERROR + NO_SUCH_USER); - free(valid_to); + free_recipients(valid_to); return; } valid_cc = validate_recipients(cc); if (valid_cc->num_error > 0) { cprintf("%d Invalid recipient (CC)\n", ERROR + NO_SUCH_USER); - free(valid_to); - free(valid_cc); + free_recipients(valid_to); + free_recipients(valid_cc); return; } valid_bcc = validate_recipients(bcc); if (valid_bcc->num_error > 0) { cprintf("%d Invalid recipient (BCC)\n", ERROR + NO_SUCH_USER); - free(valid_to); - free(valid_cc); - free(valid_bcc); + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); return; } /* Recipient required, but none were specified */ if ( (valid_to->num_error < 0) && (valid_cc->num_error < 0) && (valid_bcc->num_error < 0) ) { - free(valid_to); - free(valid_cc); - free(valid_bcc); + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); cprintf("%d At least one recipient is required.\n", ERROR + NO_SUCH_USER); return; } @@ -3324,9 +3479,9 @@ void cmd_ent0(char *entargs) cprintf("%d You do not have permission " "to send Internet mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); - free(valid_to); - free(valid_cc); - free(valid_bcc); + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); return; } } @@ -3335,9 +3490,9 @@ void cmd_ent0(char *entargs) && (CC->user.axlevel < 4) ) { cprintf("%d Higher access required for network mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); - free(valid_to); - free(valid_cc); - free(valid_bcc); + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); return; } @@ -3347,9 +3502,9 @@ void cmd_ent0(char *entargs) && (!CC->internal_pgm)) { cprintf("%d You don't have access to Internet mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); - free(valid_to); - free(valid_cc); - free(valid_bcc); + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); return; } @@ -3370,33 +3525,32 @@ void cmd_ent0(char *entargs) recp[0] = 0; } + /* Recommend to the client that the use of a message subject is + * strongly recommended in this room, if either the SUBJECTREQ flag + * is set, or if there is one or more Internet email recipients. + */ + if (CC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1; + if (valid_to) if (valid_to->num_internet > 0) subject_required = 1; + if (valid_cc) if (valid_cc->num_internet > 0) subject_required = 1; + if (valid_bcc) if (valid_bcc->num_internet > 0) subject_required = 1; + /* If we're only checking the validity of the request, return * success without creating the message. */ if (post == 0) { - cprintf("%d %s\n", CIT_OK, - ((valid_to != NULL) ? valid_to->display_recp : "") ); - free(valid_to); - free(valid_cc); - free(valid_bcc); + cprintf("%d %s|%d\n", CIT_OK, + ((valid_to != NULL) ? valid_to->display_recp : ""), + subject_required); + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); return; } /* We don't need these anymore because we'll do it differently below */ - free(valid_to); - free(valid_cc); - free(valid_bcc); - - /* Handle author masquerading */ - if (CC->fake_postname[0]) { - strcpy(masquerade_as, CC->fake_postname); - } - else if (CC->fake_username[0]) { - strcpy(masquerade_as, CC->fake_username); - } - else { - strcpy(masquerade_as, ""); - } + free_recipients(valid_to); + free_recipients(valid_cc); + free_recipients(valid_bcc); /* Read in the message from the client. */ if (do_confirm) { @@ -3407,8 +3561,8 @@ void cmd_ent0(char *entargs) msg = CtdlMakeMessage(&CC->user, recp, cc, CC->room.QRname, anonymous, format_type, - masquerade_as, subject, - ((strlen(supplied_euid) > 0) ? supplied_euid : NULL), + newusername, newuseremail, subject, + ((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL), NULL); /* Put together one big recipients struct containing to/cc/bcc all in @@ -3416,19 +3570,19 @@ void cmd_ent0(char *entargs) */ char *all_recps = malloc(SIZ * 3); strcpy(all_recps, recp); - if (strlen(cc) > 0) { - if (strlen(all_recps) > 0) { + if (!IsEmptyStr(cc)) { + if (!IsEmptyStr(all_recps)) { strcat(all_recps, ","); } strcat(all_recps, cc); } - if (strlen(bcc) > 0) { - if (strlen(all_recps) > 0) { + if (!IsEmptyStr(bcc)) { + if (!IsEmptyStr(all_recps)) { strcat(all_recps, ","); } strcat(all_recps, bcc); } - if (strlen(all_recps) > 0) { + if (!IsEmptyStr(all_recps)) { valid = validate_recipients(all_recps); } else { @@ -3457,9 +3611,8 @@ void cmd_ent0(char *entargs) CtdlFreeMessage(msg); } - CC->fake_postname[0] = '\0'; if (valid != NULL) { - free(valid); + free_recipients(valid); } return; } @@ -3473,11 +3626,9 @@ void cmd_ent0(char *entargs) int CtdlDeleteMessages(char *room_name, /* which room */ long *dmsgnums, /* array of msg numbers to be deleted */ int num_dmsgnums, /* number of msgs to be deleted, or 0 for "any" */ - char *content_type, /* or "" for any */ - int deferred /* let TDAP sweep it later */ + char *content_type /* or "" for any. regular expressions expected. */ ) { - struct ctdlroom qrbuf; struct cdbdata *cdbfr; long *msglist = NULL; @@ -3487,14 +3638,22 @@ int CtdlDeleteMessages(char *room_name, /* which room */ int num_deleted = 0; int delete_this; struct MetaData smi; + regex_t re; + regmatch_t pm; + int need_to_free_re = 0; - lprintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s, %d)\n", - room_name, num_dmsgnums, content_type, deferred); + if (content_type) if (!IsEmptyStr(content_type)) { + regcomp(&re, content_type, 0); + need_to_free_re = 1; + } + lprintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n", + room_name, num_dmsgnums, content_type); /* get room record, obtaining a lock... */ if (lgetroom(&qrbuf, room_name) != 0) { lprintf(CTDL_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", room_name); + if (need_to_free_re) regfree(&re); return (0); /* room not found */ } cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long)); @@ -3526,12 +3685,11 @@ int CtdlDeleteMessages(char *room_name, /* which room */ } } - if (strlen(content_type) == 0) { + if (IsEmptyStr(content_type)) { delete_this |= 0x02; } else { GetMetaData(&smi, msglist[i]); - if (!strcasecmp(smi.meta_content_type, - content_type)) { + if (regexec(&re, smi.meta_content_type, 1, &pm, 0) == 0) { delete_this |= 0x02; } } @@ -3551,20 +3709,6 @@ int CtdlDeleteMessages(char *room_name, /* which room */ } lputroom(&qrbuf); - /* - * If the delete operation is "deferred" (and technically, any delete - * operation not performed by THE DREADED AUTO-PURGER ought to be - * a deferred delete) then we save a pointer to the message in the - * DELETED_MSGS_ROOM. This will cause the reference count to remain - * at least 1, which will save the user from having to synchronously - * wait for various disk-intensive operations to complete. - * - * Slick -- we now use the new bulk API for moving messages. - */ - if ( (deferred) && (num_deleted) ) { - CtdlCopyMsgsToRoom(dellist, num_deleted, DELETED_MSGS_ROOM); - } - /* Go through the messages we pulled out of the index, and decrement * their reference counts by 1. If this is the only room the message * was in, the reference count will reach zero and the message will @@ -3582,6 +3726,7 @@ int CtdlDeleteMessages(char *room_name, /* which room */ if (msglist != NULL) free(msglist); if (dellist != NULL) free(dellist); lprintf(CTDL_DEBUG, "%d message(s) deleted.\n", num_deleted); + if (need_to_free_re) regfree(&re); return (num_deleted); } @@ -3592,18 +3737,15 @@ int CtdlDeleteMessages(char *room_name, /* which room */ * the current room (returns 1 for yes, 0 for no) */ int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) { - getuser(&CC->user, CC->curr_user); - if ((CC->user.axlevel < 6) - && (CC->user.usernum != CC->room.QRroomaide) - && ((CC->room.QRflags & QR_MAILBOX) == 0) - && (!(CC->internal_pgm))) { - return(0); - } - return(1); + int ra; + CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL); + if (ra & UA_DELETEALLOWED) return(1); + return(0); } + /* * Delete message from current room */ @@ -3638,7 +3780,7 @@ void cmd_dele(char *args) msgs[i] = atol(msgtok); } - num_deleted = CtdlDeleteMessages(CC->room.QRname, msgs, num_msgs, "", 1); + num_deleted = CtdlDeleteMessages(CC->room.QRname, msgs, num_msgs, ""); free(msgs); if (num_deleted) { @@ -3724,6 +3866,9 @@ void cmd_move(char *args) && (!(CC->room.QRflags & QR_MAILBOX)) && (qtemp.QRflags & QR_MAILBOX)) permit = 1; + /* Permit message removal from collaborative delete rooms */ + if (CC->room.QRflags2 & QR2_COLLABDEL) permit = 1; + /* User must have access to target room */ if (!(ra & UA_KNOWN)) permit = 0; @@ -3757,7 +3902,7 @@ void cmd_move(char *args) * if this is a 'move' rather than a 'copy' operation. */ if (is_copy == 0) { - CtdlDeleteMessages(CC->room.QRname, msgs, num_msgs, "", 0); + CtdlDeleteMessages(CC->room.QRname, msgs, num_msgs, ""); } free(msgs); @@ -3804,9 +3949,6 @@ void PutMetaData(struct MetaData *smibuf) /* Use the negative of the message number for the metadata db index */ TheIndex = (0L - smibuf->meta_msgnum); - lprintf(CTDL_DEBUG, "PutMetaData(%ld) - ref count is %d\n", - smibuf->meta_msgnum, smibuf->meta_refcount); - cdb_store(CDB_MSGMAIN, &TheIndex, (int)sizeof(long), smibuf, (int)sizeof(struct MetaData)); @@ -3814,10 +3956,112 @@ void PutMetaData(struct MetaData *smibuf) } /* - * AdjRefCount - change the reference count for a message; - * delete the message if it reaches zero + * AdjRefCount - submit an adjustment to the reference count for a message. + * (These are just queued -- we actually process them later.) */ void AdjRefCount(long msgnum, int incr) +{ + struct arcq new_arcq; + + begin_critical_section(S_SUPPMSGMAIN); + if (arcfp == NULL) { + arcfp = fopen(file_arcq, "ab+"); + } + end_critical_section(S_SUPPMSGMAIN); + + /* msgnum < 0 means that we're trying to close the file */ + if (msgnum < 0) { + lprintf(CTDL_DEBUG, "Closing the AdjRefCount queue file\n"); + begin_critical_section(S_SUPPMSGMAIN); + if (arcfp != NULL) { + fclose(arcfp); + arcfp = NULL; + } + end_critical_section(S_SUPPMSGMAIN); + return; + } + + /* + * If we can't open the queue, perform the operation synchronously. + */ + if (arcfp == NULL) { + TDAP_AdjRefCount(msgnum, incr); + return; + } + + new_arcq.arcq_msgnum = msgnum; + new_arcq.arcq_delta = incr; + fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp); + fflush(arcfp); + + return; +} + + +/* + * TDAP_ProcessAdjRefCountQueue() + * + * Process the queue of message count adjustments that was created by calls + * to AdjRefCount() ... by reading the queue and calling TDAP_AdjRefCount() + * for each one. This should be an "off hours" operation. + */ +int TDAP_ProcessAdjRefCountQueue(void) +{ + char file_arcq_temp[PATH_MAX]; + int r; + FILE *fp; + struct arcq arcq_rec; + int num_records_processed = 0; + + snprintf(file_arcq_temp, sizeof file_arcq_temp, "%s2", file_arcq); + + begin_critical_section(S_SUPPMSGMAIN); + if (arcfp != NULL) { + fclose(arcfp); + arcfp = NULL; + } + + r = link(file_arcq, file_arcq_temp); + if (r != 0) { + lprintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + end_critical_section(S_SUPPMSGMAIN); + return(num_records_processed); + } + + unlink(file_arcq); + end_critical_section(S_SUPPMSGMAIN); + + fp = fopen(file_arcq_temp, "rb"); + if (fp == NULL) { + lprintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + return(num_records_processed); + } + + while (fread(&arcq_rec, sizeof(struct arcq), 1, fp) == 1) { + TDAP_AdjRefCount(arcq_rec.arcq_msgnum, arcq_rec.arcq_delta); + ++num_records_processed; + } + + fclose(fp); + r = unlink(file_arcq_temp); + if (r != 0) { + lprintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + } + + return(num_records_processed); +} + + + +/* + * TDAP_AdjRefCount - adjust the reference count for a message. + * This one does it "for real" because it's called by + * the autopurger function that processes the queue + * created by AdjRefCount(). If a message's reference + * count becomes zero, we also delete the message from + * disk and de-index it. + */ +void TDAP_AdjRefCount(long msgnum, int incr) { struct MetaData smi; @@ -3832,7 +4076,7 @@ void AdjRefCount(long msgnum, int incr) smi.meta_refcount += incr; PutMetaData(&smi); end_critical_section(S_SUPPMSGMAIN); - lprintf(CTDL_DEBUG, "msg %ld ref count incr %d, is now %d\n", + lprintf(CTDL_DEBUG, "msg %ld ref count delta %d, is now %d\n", msgnum, incr, smi.meta_refcount); /* If the reference count is now zero, delete the message @@ -3840,11 +4084,9 @@ void AdjRefCount(long msgnum, int incr) */ if (smi.meta_refcount == 0) { lprintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum); - - /* Remove from fulltext index */ - if (config.c_enable_fulltext) { - ft_index_message(msgnum, 0); - } + + /* Call delete hooks with NULL room to show it has gone altogether */ + PerformDeleteHooks(NULL, msgnum); /* Remove from message base */ delnum = msgnum; @@ -3855,6 +4097,7 @@ void AdjRefCount(long msgnum, int incr) delnum = (0L - msgnum); cdb_delete(CDB_MSGMAIN, &delnum, (int)sizeof(long)); } + } /* @@ -3968,7 +4211,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ */ if (is_unique) { lprintf(CTDL_DEBUG, "Deleted %d other msgs of this type\n", - CtdlDeleteMessages(roomname, NULL, 0, content_type, 0) + CtdlDeleteMessages(roomname, NULL, 0, content_type) ); } /* Now write the data */ @@ -4027,7 +4270,7 @@ char *CtdlGetSysConfig(char *sysconfname) { if (conf != NULL) do { extract_token(buf, conf, 0, '\n', sizeof buf); strcpy(conf, &conf[strlen(buf)+1]); - } while ( (strlen(conf)>0) && (strlen(buf)>0) ); + } while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) ); return(conf); } @@ -4061,19 +4304,19 @@ int CtdlIsMe(char *addr, int addr_buf_len) if (recp == NULL) return(0); if (recp->num_local == 0) { - free(recp); + free_recipients(recp); return(0); } for (i=0; inum_local; ++i) { extract_token(addr, recp->recp_local, i, '|', addr_buf_len); if (!strcasecmp(addr, CC->user.fullname)) { - free(recp); + free_recipients(recp); return(1); } } - free(recp); + free_recipients(recp); return(0); }