X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=7eb321905315c9b2313e81cf0639729cb8891ebe;hb=e26a8dee20d1726b4995821f717f867f50fc5659;hp=1d411f4c99b8804845c11691a6ae380fc16fd3b7;hpb=fe52bf9a01ad0bec838e7b71fe2e129a4606217b;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 1d411f4c9..7eb321905 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -1,11 +1,9 @@ /* - * $Id$ - * * Implements the message store. * - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -200,7 +198,7 @@ int alias(char *name) } if (strcasecmp(original_name, name)) { - CtdlLogPrintf(CTDL_INFO, "%s is being forwarded to %s\n", original_name, name); + syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name); } /* Change "user @ xxx" to "user" if xxx is an alias for this host */ @@ -208,7 +206,7 @@ int alias(char *name) if (name[a] == '@') { if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) { name[a] = 0; - CtdlLogPrintf(CTDL_INFO, "Changed to <%s>\n", name); + syslog(LOG_INFO, "Changed to <%s>\n", name); } } } @@ -309,7 +307,10 @@ void headers_euid(long msgnum, void *userdata) return; } - cprintf("%ld|%s|\n", msgnum, (msg->cm_fields['E'] ? msg->cm_fields['E'] : "")); + cprintf("%ld|%s|%s\n", + msgnum, + (msg->cm_fields['E'] ? msg->cm_fields['E'] : ""), + (msg->cm_fields['T'] ? msg->cm_fields['T'] : "0")); CtdlFreeMessage(msg); } @@ -353,7 +354,7 @@ int CtdlMsgCmp(struct CtdlMessage *msg, struct CtdlMessage *template) { * Retrieve the "seen" message list for the current room. */ void CtdlGetSeen(char *buf, int which_set) { - struct visit vbuf; + visit vbuf; /* Learn about the user and room in question */ CtdlGetRelationship(&vbuf, &CC->user, &CC->room); @@ -378,7 +379,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, int was_seen = 0; long lo = (-1L); long hi = (-1L); - struct visit vbuf; + visit vbuf; long *msglist; int num_msgs = 0; StrBuf *vset; @@ -403,7 +404,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, which_user = &CC->user; } - CtdlLogPrintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n", + syslog(LOG_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n", num_target_msgnums, target_msgnums[0], (target_setting ? "SET" : "CLEAR"), which_set, @@ -440,17 +441,17 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, #if 0 /* This is a special diagnostic section. Do not allow it to run during normal operation. */ - CtdlLogPrintf(CTDL_DEBUG, "There are %d messages in the room.\n", num_msgs); + syslog(LOG_DEBUG, "There are %d messages in the room.\n", num_msgs); for (i=0; i 0) && (msglist[i] <= msglist[i-1])) abort(); } - CtdlLogPrintf(CTDL_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums); + syslog(LOG_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums); for (k=0; k 0) && (target_msgnums[k] <= target_msgnums[k-1])) abort(); } #endif - CtdlLogPrintf(CTDL_DEBUG, "before update: %s\n", ChrPtr(vset)); + syslog(LOG_DEBUG, "before update: %s\n", ChrPtr(vset)); /* Translate the existing sequence set into an array of booleans */ setstr = NewStrBuf(); @@ -573,7 +574,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, vset = new_set; } - CtdlLogPrintf(CTDL_DEBUG, " after update: %s\n", ChrPtr(vset)); + syslog(LOG_DEBUG, " after update: %s\n", ChrPtr(vset)); /* Decide which message set we're manipulating */ switch (which_set) { @@ -604,7 +605,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, { int a, i, j; - struct visit vbuf; + visit vbuf; struct cdbdata *cdbfr; long *msglist = NULL; int num_msgs = 0; @@ -632,14 +633,16 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, /* Load the message list */ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); - if (cdbfr != NULL) { - msglist = (long *) cdbfr->ptr; - num_msgs = cdbfr->len / sizeof(long); - } else { + if (cdbfr == NULL) { if (need_to_free_re) regfree(&re); return 0; /* No messages at all? No further action. */ } + msglist = (long *) cdbfr->ptr; + num_msgs = cdbfr->len / sizeof(long); + + cdbfr->ptr = NULL; /* clear this so that cdb_free() doesn't free it */ + cdb_free(cdbfr); /* we own this memory now */ /* * Now begin the traversal. @@ -771,8 +774,22 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, ++num_processed; } } - cdb_free(cdbfr); /* Clean up */ if (need_to_free_re) regfree(&re); + + /* + * We cache the most recent msglist in order to do security checks later + */ + if (CC->client_socket > 0) { + if (CC->cached_msglist != NULL) { + free(CC->cached_msglist); + } + CC->cached_msglist = msglist; + CC->cached_num_msgs = num_msgs; + } + else { + free(msglist); + } + return num_processed; } @@ -796,6 +813,8 @@ void cmd_msgs(char *cmdbuf) char search_string[1024]; ForEachMsgCallback CallBack; + if (CtdlAccessCheck(ac_logged_in_or_guest)) return; + extract_token(which, cmdbuf, 0, '|', sizeof which); cm_ref = extract_int(cmdbuf, 1); extract_token(search_string, cmdbuf, 1, '|', sizeof search_string); @@ -832,11 +851,6 @@ void cmd_msgs(char *cmdbuf) else mode = MSGS_ALL; - if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { - cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN); - return; - } - if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) { cprintf("%d Full text index is not enabled on this server.\n", ERROR + CMD_NOT_SUPPORTED); @@ -930,19 +944,27 @@ void memfmout( const char *nl /* string to terminate lines with */ ) { int column = 0; - char ch = 0; + unsigned char ch = 0; char outbuf[1024]; int len = 0; int nllen = 0; if (!mptr) return; nllen = strlen(nl); - while (ch=*(mptr++), ch > 0) { + while (ch=*(mptr++), ch != 0) { if (ch == '\n') { - client_write(outbuf, len); + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } len = 0; - client_write(nl, nllen); + if (client_write(nl, nllen) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } column = 0; } else if (ch == '\r') { @@ -950,9 +972,17 @@ void memfmout( } else if (isspace(ch)) { if (column > 72) { /* Beyond 72 columns, break on the next space */ - client_write(outbuf, len); + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } len = 0; - client_write(nl, nllen); + if (client_write(nl, nllen) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } column = 0; } else { @@ -964,15 +994,27 @@ void memfmout( outbuf[len++] = ch; ++column; if (column > 1000) { /* Beyond 1000 columns, break anywhere */ - client_write(outbuf, len); + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } len = 0; - client_write(nl, nllen); + if (client_write(nl, nllen) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } column = 0; } } } if (len) { - client_write(outbuf, len); + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } len = 0; client_write(nl, nllen); column = 0; @@ -1064,6 +1106,10 @@ void mime_download(char *name, char *filename, char *partnum, char *disp, return; rv = fwrite(content, length, 1, CC->download_fp); + if (rv == -1) { + syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n", + strerror(errno)); + } fflush(CC->download_fp); rewind(CC->download_fp); @@ -1100,7 +1146,6 @@ void mime_spew_section(char *name, char *filename, char *partnum, char *disp, } - /* * Load a message from disk into memory. * This is used by CtdlOutputMsg() and other fetch functions. @@ -1117,8 +1162,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) cit_uint8_t ch; cit_uint8_t field_header; - CtdlLogPrintf(CTDL_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); - + syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long)); if (dmsgtext == NULL) { return NULL; @@ -1133,7 +1177,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) */ ch = *mptr++; if (ch != 255) { - CtdlLogPrintf(CTDL_ERR, "Message %ld appears to be corrupted.\n", msgnum); + syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum); cdb_free(dmsgtext); return NULL; } @@ -1170,7 +1214,8 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) if ( (ret->cm_fields['M'] == NULL) && (with_body) ) { dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long)); if (dmsgtext != NULL) { - ret->cm_fields['M'] = strdup(dmsgtext->ptr); + ret->cm_fields['M'] = dmsgtext->ptr; + dmsgtext->ptr = NULL; cdb_free(dmsgtext); } } @@ -1196,7 +1241,7 @@ int is_valid_message(struct CtdlMessage *msg) { if (msg == NULL) return 0; if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) { - CtdlLogPrintf(CTDL_WARNING, "is_valid_message() -- self-check failed\n"); + syslog(LOG_WARNING, "is_valid_message() -- self-check failed\n"); return 0; } return 1; @@ -1243,7 +1288,7 @@ void fixed_output_pre(char *name, char *filename, char *partnum, char *disp, struct ma_info *ma; ma = (struct ma_info *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype); + syslog(LOG_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype); if (!strcasecmp(cbtype, "multipart/alternative")) { ++ma->is_ma; ma->did_print = 0; @@ -1263,7 +1308,7 @@ void fixed_output_post(char *name, char *filename, char *partnum, char *disp, struct ma_info *ma; ma = (struct ma_info *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, "fixed_output_post() type=<%s>\n", cbtype); + syslog(LOG_DEBUG, "fixed_output_post() type=<%s>\n", cbtype); if (!strcasecmp(cbtype, "multipart/alternative")) { --ma->is_ma; ma->did_print = 0; @@ -1287,7 +1332,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp, ma = (struct ma_info *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, + syslog(LOG_DEBUG, "fixed_output() part %s: %s (%s) (%ld bytes)\n", partnum, filename, cbtype, (long)length); @@ -1296,7 +1341,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp, * we've already printed another section, skip this one. */ if ( (ma->is_ma) && (ma->did_print) ) { - CtdlLogPrintf(CTDL_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype); + syslog(LOG_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype); return; } ma->did_print = 1; @@ -1368,7 +1413,7 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) { if (i < ma->chosen_pref) { - CtdlLogPrintf(CTDL_DEBUG, "Setting chosen part: <%s>\n", partnum); + syslog(LOG_DEBUG, "Setting chosen part: <%s>\n", partnum); safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part); ma->chosen_pref = i; } @@ -1379,16 +1424,27 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, /* * Now that we've chosen our preferred part, output it. */ -void output_preferred(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, char *cbcharset, size_t length, - char *encoding, char *cbid, void *cbuserdata) +void output_preferred(char *name, + char *filename, + char *partnum, + char *disp, + void *content, + char *cbtype, + char *cbcharset, + size_t length, + char *encoding, + char *cbid, + void *cbuserdata) { int i; char buf[128]; int add_newline = 0; char *text_content; struct ma_info *ma; - + char *decoded = NULL; + size_t bytes_decoded; + int rc = 0; + ma = (struct ma_info *)cbuserdata; /* This is not the MIME part you're looking for... */ @@ -1401,8 +1457,21 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); if (!strcasecmp(buf, cbtype)) { /* Yeah! Go! W00t!! */ + if (ma->dont_decode == 0) + rc = mime_decode_now (content, + length, + encoding, + &decoded, + &bytes_decoded); + if (rc < 0) + break; /* Give us the chance, maybe theres another one. */ + + if (rc == 0) text_content = (char *)content; + else { + text_content = decoded; + length = bytes_decoded; + } - text_content = (char *)content; if (text_content[length-1] != '\n') { ++add_newline; } @@ -1420,16 +1489,38 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, } cprintf("X-Citadel-MSG4-Partnum: %s\n", partnum); cprintf("\n"); - client_write(content, length); + if (client_write(text_content, length) == -1) + { + syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n"); + return; + } if (add_newline) cprintf("\n"); + if (decoded != NULL) free(decoded); return; } } /* No translations required or possible: output as text/plain */ cprintf("Content-type: text/plain\n\n"); - fixed_output(name, filename, partnum, disp, content, cbtype, cbcharset, + rc = 0; + if (ma->dont_decode == 0) + rc = mime_decode_now (content, + length, + encoding, + &decoded, + &bytes_decoded); + if (rc < 0) + return; /* Give us the chance, maybe theres another one. */ + + if (rc == 0) text_content = (char *)content; + else { + text_content = decoded; + length = bytes_decoded; + } + + fixed_output(name, filename, partnum, disp, text_content, cbtype, cbcharset, length, encoding, cbid, cbuserdata); + if (decoded != NULL) free(decoded); } @@ -1458,16 +1549,52 @@ void extract_encapsulated_message(char *name, char *filename, char *partnum, cha memcpy(encap->msg, content, length); return; } - } +/* + * Determine whether the specified message exists in the cached_msglist + * (This is a security check) + */ +int check_cached_msglist(long msgnum) { + + /* cases in which we skip the check */ + if (!CC) return om_ok; /* not a session */ + if (CC->client_socket <= 0) return om_ok; /* not a client session */ + if (CC->cached_msglist == NULL) return om_access_denied; /* no msglist fetched */ + if (CC->cached_num_msgs == 0) return om_access_denied; /* nothing to check */ + /* Do a binary search within the cached_msglist for the requested msgnum */ + int min = 0; + int max = (CC->cached_num_msgs - 1); + while (max >= min) { + int middle = min + (max-min) / 2 ; + if (msgnum == CC->cached_msglist[middle]) { + return om_ok; + } + if (msgnum > CC->cached_msglist[middle]) { + min = middle + 1; + } + else { + max = middle - 1; + } + } + + return om_access_denied; +} + +/* + * Determine whether the currently logged in session has permission to read + * messages in the current room. + */ int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) { - if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { + if ( (!(CC->logged_in)) + && (!(CC->internal_pgm)) + && (!config.c_guest_logins) + ) { return(om_not_logged_in); } return(om_ok); @@ -1491,7 +1618,7 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ struct encapmsg encap; int r; - CtdlLogPrintf(CTDL_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n", + syslog(LOG_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n", msg_num, mode, (section ? section : "<>") ); @@ -1509,7 +1636,29 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ return(r); } - /* FIXME: check message id against msglist for this room */ + /* + * Check to make sure the message is actually IN this room + */ + r = check_cached_msglist(msg_num); + if (r == om_access_denied) { + /* Not in the cache? We get ONE shot to check it again. */ + CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, NULL, NULL); + r = check_cached_msglist(msg_num); + } + if (r != om_ok) { + syslog(LOG_DEBUG, "Security check fail: message %ld is not in %s\n", + msg_num, CC->room.QRname + ); + if (do_proto) { + if (r == om_access_denied) { + cprintf("%d message %ld was not found in this room\n", + ERROR + HIGHER_ACCESS_REQUIRED, + msg_num + ); + } + } + return(r); + } /* * Fetch the message from disk. If we're in HEADERS_FAST mode, @@ -1572,7 +1721,7 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ char *qp_encode_email_addrs(char *source) { - char user[256], node[256], name[256]; + char *user, *node, *name; const char headerStr[] = "=?UTF-8?Q?"; char *Encoded; char *EncodedName; @@ -1590,6 +1739,8 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; + cit_backtrace(); + syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source); AddrPtr = malloc (sizeof (long) * nAddrPtrMax); AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); @@ -1637,6 +1788,10 @@ char *qp_encode_email_addrs(char *source) for (i = 0; i < nColons; i++) source[AddrPtr[i]++] = '\0'; + /* TODO: if libidn, this might get larger*/ + user = malloc(SourceLen + 1); + node = malloc(SourceLen + 1); + name = malloc(SourceLen + 1); nPtr = Encoded; *nPtr = '\0'; @@ -1680,6 +1835,10 @@ char *qp_encode_email_addrs(char *source) } for (i = 0; i < nColons; i++) source[--AddrPtr[i]] = ','; + + free(user); + free(node); + free(name); free(AddrUtf8); free(AddrPtr); return Encoded; @@ -1710,6 +1869,347 @@ void sanitize_truncated_recipient(char *str) } +void OutputCtdlMsgHeaders( + struct CtdlMessage *TheMessage, + int do_proto) /* do Citadel protocol responses? */ +{ + char allkeys[30]; + int i, k, n; + int suppress_f = 0; + char buf[SIZ]; + char display_name[256]; + + /* begin header processing loop for Citadel message format */ + safestrncpy(display_name, "", sizeof display_name); + if (TheMessage->cm_fields['A']) { + strcpy(buf, TheMessage->cm_fields['A']); + if (TheMessage->cm_anon_type == MES_ANONONLY) { + safestrncpy(display_name, "****", sizeof display_name); + } + else if (TheMessage->cm_anon_type == MES_ANONOPT) { + safestrncpy(display_name, "anonymous", sizeof display_name); + } + else { + safestrncpy(display_name, buf, sizeof display_name); + } + if ((is_room_aide()) + && ((TheMessage->cm_anon_type == MES_ANONONLY) + || (TheMessage->cm_anon_type == MES_ANONOPT))) { + size_t tmp = strlen(display_name); + snprintf(&display_name[tmp], + sizeof display_name - tmp, + " [%s]", buf); + } + } + + /* Don't show Internet address for users on the + * local Citadel network. + */ + suppress_f = 0; + if (TheMessage->cm_fields['N'] != NULL) + if (!IsEmptyStr(TheMessage->cm_fields['N'])) + if (haschar(TheMessage->cm_fields['N'], '.') == 0) { + suppress_f = 1; + } + + /* Now spew the header fields in the order we like them. */ + n = safestrncpy(allkeys, FORDER, sizeof allkeys); + for (i=0; icm_fields[k] != NULL) + && (msgkeys[k] != NULL) ) { + if ((k == 'V') || (k == 'R') || (k == 'Y')) { + sanitize_truncated_recipient(TheMessage->cm_fields[k]); + } + if (k == 'A') { + if (do_proto) cprintf("%s=%s\n", + msgkeys[k], + display_name); + } + else if ((k == 'F') && (suppress_f)) { + /* do nothing */ + } + /* Masquerade display name if needed */ + else { + if (do_proto) cprintf("%s=%s\n", + msgkeys[k], + TheMessage->cm_fields[k] + ); + } + } + } + } + +} + +void OutputRFC822MsgHeaders( + struct CtdlMessage *TheMessage, + int flags, /* should the bessage be exported clean */ + const char *nl, + char *mid, long sizeof_mid, + char *suser, long sizeof_suser, + char *luser, long sizeof_luser, + char *fuser, long sizeof_fuser, + char *snode, long sizeof_snode) +{ + char datestamp[100]; + int subject_found = 0; + char buf[SIZ]; + int i, j, k; + char *mptr = NULL; + char *mpptr = NULL; + char *hptr; + + for (i = 0; i < 256; ++i) { + if (TheMessage->cm_fields[i]) { + mptr = mpptr = TheMessage->cm_fields[i]; + + if (i == 'A') { + safestrncpy(luser, mptr, sizeof_luser); + safestrncpy(suser, mptr, sizeof_suser); + } + else if (i == 'Y') { + if ((flags & QP_EADDR) != 0) { + mptr = qp_encode_email_addrs(mptr); + } + sanitize_truncated_recipient(mptr); + cprintf("CC: %s%s", mptr, nl); + } + else if (i == 'P') { + cprintf("Return-Path: %s%s", mptr, nl); + } + else if (i == 'L') { + cprintf("List-ID: %s%s", mptr, nl); + } + else if (i == 'V') { + if ((flags & QP_EADDR) != 0) + mptr = qp_encode_email_addrs(mptr); + hptr = mptr; + while ((*hptr != '\0') && isspace(*hptr)) + hptr ++; + if (!IsEmptyStr(hptr)) + cprintf("Envelope-To: %s%s", hptr, nl); + } + else if (i == 'U') { + cprintf("Subject: %s%s", mptr, nl); + subject_found = 1; + } + else if (i == 'I') + safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found. + else if (i == 'F') + safestrncpy(fuser, mptr, sizeof_fuser); + /* else if (i == 'O') + cprintf("X-Citadel-Room: %s%s", + mptr, nl); */ + else if (i == 'N') + safestrncpy(snode, mptr, sizeof_snode); + else if (i == 'R') + { + if (haschar(mptr, '@') == 0) + { + sanitize_truncated_recipient(mptr); + cprintf("To: %s@%s", mptr, config.c_fqdn); + cprintf("%s", nl); + } + else + { + if ((flags & QP_EADDR) != 0) { + mptr = qp_encode_email_addrs(mptr); + } + sanitize_truncated_recipient(mptr); + cprintf("To: %s", mptr); + cprintf("%s", nl); + } + } + else if (i == 'T') { + datestring(datestamp, sizeof datestamp, + atol(mptr), DATESTRING_RFC822); + cprintf("Date: %s%s", datestamp, nl); + } + else if (i == 'W') { + cprintf("References: "); + k = num_tokens(mptr, '|'); + for (j=0; j", buf); + if (j == (k-1)) { + cprintf("%s", nl); + } + else { + cprintf(" "); + } + } + } + else if (i == 'K') { + hptr = mptr; + while ((*hptr != '\0') && isspace(*hptr)) + hptr ++; + if (!IsEmptyStr(hptr)) + cprintf("Reply-To: %s%s", mptr, nl); + } + if (mptr != mpptr) + free (mptr); + } + } + if (subject_found == 0) { + cprintf("Subject: (no subject)%s", nl); + } +} + + +void Dump_RFC822HeadersBody( + struct CtdlMessage *TheMessage, + int headers_only, /* eschew the message body? */ + int flags, /* should the bessage be exported clean? */ + + const char *nl) +{ + cit_uint8_t prev_ch; + int eoh = 0; + const char *StartOfText = StrBufNOTNULL; + char outbuf[1024]; + int outlen = 0; + int nllen = strlen(nl); + char *mptr; + + mptr = TheMessage->cm_fields['M']; + + + prev_ch = '\0'; + while (*mptr != '\0') { + if (*mptr == '\r') { + /* do nothing */ + } + else { + if ((!eoh) && + (*mptr == '\n')) + { + eoh = (*(mptr+1) == '\r') && (*(mptr+2) == '\n'); + if (!eoh) + eoh = *(mptr+1) == '\n'; + if (eoh) + { + StartOfText = mptr; + StartOfText = strchr(StartOfText, '\n'); + StartOfText = strchr(StartOfText, '\n'); + } + } + if (((headers_only == HEADERS_NONE) && (mptr >= StartOfText)) || + ((headers_only == HEADERS_ONLY) && (mptr < StartOfText)) || + ((headers_only != HEADERS_NONE) && + (headers_only != HEADERS_ONLY)) + ) { + if (*mptr == '\n') { + memcpy(&outbuf[outlen], nl, nllen); + outlen += nllen; + outbuf[outlen] = '\0'; + } + else { + outbuf[outlen++] = *mptr; + } + } + } + if (flags & ESC_DOT) + { + if ((prev_ch == '\n') && + (*mptr == '.') && + ((*(mptr+1) == '\r') || (*(mptr+1) == '\n'))) + { + outbuf[outlen++] = '.'; + } + prev_ch = *mptr; + } + ++mptr; + if (outlen > 1000) { + if (client_write(outbuf, outlen) == -1) + { + syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n"); + return; + } + outlen = 0; + } + } + if (outlen > 0) { + client_write(outbuf, outlen); + outlen = 0; + } +} + + + +/* If the format type on disk is 1 (fixed-format), then we want + * everything to be output completely literally ... regardless of + * what message transfer format is in use. + */ +void DumpFormatFixed( + struct CtdlMessage *TheMessage, + int mode, /* how would you like that message? */ + const char *nl) +{ + cit_uint8_t ch; + char buf[SIZ]; + int buflen; + int xlline = 0; + int nllen = strlen (nl); + char *mptr; + + mptr = TheMessage->cm_fields['M']; + + if (mode == MT_MIME) { + cprintf("Content-type: text/plain\n\n"); + } + *buf = '\0'; + buflen = 0; + while (ch = *mptr++, ch > 0) { + if (ch == '\n') + ch = '\r'; + + if ((buflen > 250) && (!xlline)){ + int tbuflen; + tbuflen = buflen; + + while ((buflen > 0) && + (!isspace(buf[buflen]))) + buflen --; + if (buflen == 0) { + xlline = 1; + } + else { + mptr -= tbuflen - buflen; + buf[buflen] = '\0'; + ch = '\r'; + } + } + /* if we reach the outer bounds of our buffer, + abort without respect what whe purge. */ + if (xlline && + ((isspace(ch)) || + (buflen > SIZ - nllen - 2))) + ch = '\r'; + + if (ch == '\r') { + memcpy (&buf[buflen], nl, nllen); + buflen += nllen; + buf[buflen] = '\0'; + + if (client_write(buf, buflen) == -1) + { + syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n"); + return; + } + *buf = '\0'; + buflen = 0; + xlline = 0; + } else { + buf[buflen] = ch; + buflen++; + } + } + buf[buflen] = '\0'; + if (!IsEmptyStr(buf)) + cprintf("%s%s", buf, nl); +} /* * Get a message off disk. (returns om_* values found in msgbase.h) @@ -1722,15 +2222,9 @@ int CtdlOutputPreLoadedMsg( int crlf, /* Use CRLF newlines instead of LF? */ int flags /* should the bessage be exported clean? */ ) { - int i, j, k, n; - char buf[SIZ]; - cit_uint8_t ch, prev_ch; - char allkeys[30]; - char display_name[256]; - char *mptr, *mpptr; + int i; + char *mptr = NULL; const char *nl; /* newline string */ - int suppress_f = 0; - int subject_found = 0; struct ma_info ma; /* Buffers needed for RFC822 translation. These are all filled @@ -1742,9 +2236,8 @@ int CtdlOutputPreLoadedMsg( char fuser[100]; char snode[100]; char mid[100]; - char datestamp[100]; - CtdlLogPrintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n", + syslog(LOG_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n", ((TheMessage == NULL) ? "NULL" : "not null"), mode, headers_only, do_proto, crlf); @@ -1752,7 +2245,7 @@ int CtdlOutputPreLoadedMsg( nl = (crlf ? "\r\n" : "\n"); if (!is_valid_message(TheMessage)) { - CtdlLogPrintf(CTDL_ERR, + syslog(LOG_ERR, "ERROR: invalid preloaded message for output\n"); cit_backtrace (); return(om_no_such_msg); @@ -1837,164 +2330,27 @@ int CtdlOutputPreLoadedMsg( cprintf("nhdr=yes\n"); } - /* begin header processing loop for Citadel message format */ + if ((mode == MT_CITADEL) || (mode == MT_MIME)) + OutputCtdlMsgHeaders(TheMessage, do_proto); - if ((mode == MT_CITADEL) || (mode == MT_MIME)) { - - safestrncpy(display_name, "", sizeof display_name); - if (TheMessage->cm_fields['A']) { - strcpy(buf, TheMessage->cm_fields['A']); - if (TheMessage->cm_anon_type == MES_ANONONLY) { - safestrncpy(display_name, "****", sizeof display_name); - } - else if (TheMessage->cm_anon_type == MES_ANONOPT) { - safestrncpy(display_name, "anonymous", sizeof display_name); - } - else { - safestrncpy(display_name, buf, sizeof display_name); - } - if ((is_room_aide()) - && ((TheMessage->cm_anon_type == MES_ANONONLY) - || (TheMessage->cm_anon_type == MES_ANONOPT))) { - size_t tmp = strlen(display_name); - snprintf(&display_name[tmp], - sizeof display_name - tmp, - " [%s]", buf); - } - } - - /* Don't show Internet address for users on the - * local Citadel network. - */ - suppress_f = 0; - if (TheMessage->cm_fields['N'] != NULL) - if (!IsEmptyStr(TheMessage->cm_fields['N'])) - if (haschar(TheMessage->cm_fields['N'], '.') == 0) { - suppress_f = 1; - } - - /* Now spew the header fields in the order we like them. */ - n = safestrncpy(allkeys, FORDER, sizeof allkeys); - for (i=0; icm_fields[k] != NULL) - && (msgkeys[k] != NULL) ) { - if ((k == 'V') || (k == 'R') || (k == 'Y')) { - sanitize_truncated_recipient(TheMessage->cm_fields[k]); - } - if (k == 'A') { - if (do_proto) cprintf("%s=%s\n", - msgkeys[k], - display_name); - } - else if ((k == 'F') && (suppress_f)) { - /* do nothing */ - } - /* Masquerade display name if needed */ - else { - if (do_proto) cprintf("%s=%s\n", - msgkeys[k], - TheMessage->cm_fields[k] - ); - } - } - } - } - - } /* begin header processing loop for RFC822 transfer format */ - strcpy(suser, ""); strcpy(luser, ""); strcpy(fuser, ""); strcpy(snode, NODENAME); - if (mode == MT_RFC822) { - for (i = 0; i < 256; ++i) { - if (TheMessage->cm_fields[i]) { - mptr = mpptr = TheMessage->cm_fields[i]; - - if (i == 'A') { - safestrncpy(luser, mptr, sizeof luser); - safestrncpy(suser, mptr, sizeof suser); - } - else if (i == 'Y') { - if ((flags & QP_EADDR) != 0) { - mptr = qp_encode_email_addrs(mptr); - } - sanitize_truncated_recipient(mptr); - cprintf("CC: %s%s", mptr, nl); - } - else if (i == 'P') { - cprintf("Return-Path: %s%s", mptr, nl); - } - else if (i == 'L') { - cprintf("List-ID: %s%s", mptr, nl); - } - else if (i == 'V') { - if ((flags & QP_EADDR) != 0) - mptr = qp_encode_email_addrs(mptr); - cprintf("Envelope-To: %s%s", mptr, nl); - } - else if (i == 'U') { - cprintf("Subject: %s%s", mptr, nl); - subject_found = 1; - } - else if (i == 'I') - safestrncpy(mid, mptr, sizeof mid); - else if (i == 'F') - safestrncpy(fuser, mptr, sizeof fuser); - /* else if (i == 'O') - cprintf("X-Citadel-Room: %s%s", - mptr, nl); */ - else if (i == 'N') - safestrncpy(snode, mptr, sizeof snode); - else if (i == 'R') - { - if (haschar(mptr, '@') == 0) - { - sanitize_truncated_recipient(mptr); - cprintf("To: %s@%s", mptr, config.c_fqdn); - cprintf("%s", nl); - } - else - { - if ((flags & QP_EADDR) != 0) { - mptr = qp_encode_email_addrs(mptr); - } - sanitize_truncated_recipient(mptr); - cprintf("To: %s", mptr); - cprintf("%s", nl); - } - } - else if (i == 'T') { - datestring(datestamp, sizeof datestamp, - atol(mptr), DATESTRING_RFC822); - cprintf("Date: %s%s", datestamp, nl); - } - else if (i == 'W') { - cprintf("References: "); - k = num_tokens(mptr, '|'); - for (j=0; j", buf); - if (j == (k-1)) { - cprintf("%s", nl); - } - else { - cprintf(" "); - } - } - } - if (mptr != mpptr) - free (mptr); - } - } - if (subject_found == 0) { - cprintf("Subject: (no subject)%s", nl); - } - } + if (mode == MT_RFC822) + OutputRFC822MsgHeaders( + TheMessage, + flags, + nl, + mid, sizeof(mid), + suser, sizeof(suser), + luser, sizeof(luser), + fuser, sizeof(fuser), + snode, sizeof(snode) + ); + for (i=0; !IsEmptyStr(&suser[i]); ++i) { suser[i] = tolower(suser[i]); @@ -2035,80 +2391,24 @@ int CtdlOutputPreLoadedMsg( /* end header processing loop ... at this point, we're in the text */ START_TEXT: if (headers_only == HEADERS_FAST) goto DONE; - mptr = TheMessage->cm_fields['M']; /* Tell the client about the MIME parts in this message */ if (TheMessage->cm_format_type == FMT_RFC822) { if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) { + mptr = TheMessage->cm_fields['M']; memset(&ma, 0, sizeof(struct ma_info)); mime_parser(mptr, NULL, (do_proto ? *list_this_part : NULL), (do_proto ? *list_this_pref : NULL), (do_proto ? *list_this_suff : NULL), - (void *)&ma, 0); + (void *)&ma, 1); } else if (mode == MT_RFC822) { /* unparsed RFC822 dump */ - int eoh = 0; - const char *StartOfText = StrBufNOTNULL; - - char outbuf[1024]; - int outlen = 0; - int nllen = strlen(nl); - prev_ch = '\0'; - while (*mptr != '\0') { - if (*mptr == '\r') { - /* do nothing */ - } - else { - if ((!eoh) && - (*mptr == '\n')) - { - eoh = (*(mptr+1) == '\r') && (*(mptr+2) == '\n'); - if (!eoh) - eoh = *(mptr+1) == '\n'; - if (eoh) - { - StartOfText = mptr; - StartOfText = strchr(StartOfText, '\n'); - StartOfText = strchr(StartOfText, '\n'); - } - } - if (((headers_only == HEADERS_NONE) && (mptr >= StartOfText)) || - ((headers_only == HEADERS_ONLY) && (mptr < StartOfText)) || - ((headers_only != HEADERS_NONE) && - (headers_only != HEADERS_ONLY)) - ) { - if (*mptr == '\n') { - memcpy(&outbuf[outlen], nl, nllen); - outlen += nllen; - outbuf[outlen] = '\0'; - } - else { - outbuf[outlen++] = *mptr; - } - } - } - if (flags & ESC_DOT) - { - if ((prev_ch == '\n') && - (*mptr == '.') && - ((*(mptr+1) == '\r') || (*(mptr+1) == '\n'))) - { - outbuf[outlen++] = '.'; - } - prev_ch = *mptr; - } - ++mptr; - if (outlen > 1000) { - client_write(outbuf, outlen); - outlen = 0; - } - } - if (outlen > 0) { - client_write(outbuf, outlen); - outlen = 0; - } - + Dump_RFC822HeadersBody( + TheMessage, + headers_only, + flags, + nl); goto DONE; } } @@ -2122,64 +2422,11 @@ START_TEXT: if (do_proto) cprintf("text\n"); } - /* If the format type on disk is 1 (fixed-format), then we want - * everything to be output completely literally ... regardless of - * what message transfer format is in use. - */ - if (TheMessage->cm_format_type == FMT_FIXED) { - int buflen; - int xlline = 0; - int nllen = strlen (nl); - if (mode == MT_MIME) { - cprintf("Content-type: text/plain\n\n"); - } - *buf = '\0'; - buflen = 0; - while (ch = *mptr++, ch > 0) { - if (ch == '\n') - ch = '\r'; - - if ((buflen > 250) && (!xlline)){ - int tbuflen; - tbuflen = buflen; - - while ((buflen > 0) && - (!isspace(buf[buflen]))) - buflen --; - if (buflen == 0) { - xlline = 1; - } - else { - mptr -= tbuflen - buflen; - buf[buflen] = '\0'; - ch = '\r'; - } - } - /* if we reach the outer bounds of our buffer, - abort without respect what whe purge. */ - if (xlline && - ((isspace(ch)) || - (buflen > SIZ - nllen - 2))) - ch = '\r'; - - if (ch == '\r') { - memcpy (&buf[buflen], nl, nllen); - buflen += nllen; - buf[buflen] = '\0'; - - client_write(buf, buflen); - *buf = '\0'; - buflen = 0; - xlline = 0; - } else { - buf[buflen] = ch; - buflen++; - } - } - buf[buflen] = '\0'; - if (!IsEmptyStr(buf)) - cprintf("%s%s", buf, nl); - } + if (TheMessage->cm_format_type == FMT_FIXED) + DumpFormatFixed( + TheMessage, + mode, /* how would you like that message? */ + nl); /* If the message on disk is format 0 (Citadel vari-format), we * output using the formatter at 80 columns. This is the final output @@ -2189,6 +2436,8 @@ START_TEXT: * message to the reader's screen width. */ if (TheMessage->cm_format_type == FMT_CITADEL) { + mptr = TheMessage->cm_fields['M']; + if (mode == MT_MIME) { cprintf("Content-type: text/x-citadel-variformat\n\n"); } @@ -2207,11 +2456,12 @@ START_TEXT: ma.use_fo_hooks = 0; strcpy(ma.chosen_part, "1"); ma.chosen_pref = 9999; + ma.dont_decode = CC->msg4_dont_decode; mime_parser(mptr, NULL, *choose_preferred, *fixed_output_pre, - *fixed_output_post, (void *)&ma, 0); + *fixed_output_post, (void *)&ma, 1); mime_parser(mptr, NULL, - *output_preferred, NULL, NULL, (void *)&ma, CC->msg4_dont_decode); + *output_preferred, NULL, NULL, (void *)&ma, 1); } else { ma.use_fo_hooks = 1; @@ -2389,7 +2639,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms long *msgs_to_be_merged = NULL; int num_msgs_to_be_merged = 0; - CtdlLogPrintf(CTDL_DEBUG, + syslog(LOG_DEBUG, "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n", roomname, num_newmsgs, do_repl_check, suppress_refcount_adj ); @@ -2405,7 +2655,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms if (CtdlGetRoomLock(&CC->room, ((roomname != NULL) ? roomname : CC->room.QRname) ) != 0) { - CtdlLogPrintf(CTDL_ERR, "No such room <%s>\n", roomname); + syslog(LOG_ERR, "No such room <%s>\n", roomname); return(ERROR + ROOM_NOT_FOUND); } @@ -2442,14 +2692,14 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms } } - CtdlLogPrintf(9, "%d unique messages to be merged\n", num_msgs_to_be_merged); + syslog(LOG_DEBUG, "%d unique messages to be merged\n", num_msgs_to_be_merged); /* * Now merge the new messages */ msglist = realloc(msglist, (sizeof(long) * (num_msgs + num_msgs_to_be_merged)) ); if (msglist == NULL) { - CtdlLogPrintf(CTDL_ALERT, "ERROR: can't realloc message list!\n"); + syslog(LOG_ALERT, "ERROR: can't realloc message list!\n"); } memcpy(&msglist[num_msgs], msgs_to_be_merged, (sizeof(long) * num_msgs_to_be_merged) ); num_msgs += num_msgs_to_be_merged; @@ -2473,7 +2723,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms /* Perform replication checks if necessary */ if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) { - CtdlLogPrintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n"); + syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n"); for (i=0; icm_fields['I']==NULL) { @@ -2592,7 +2846,7 @@ long send_message(struct CtdlMessage *msg) { /* Write our little bundle of joy into the message base */ if (cdb_store(CDB_MSGMAIN, &newmsgid, (int)sizeof(long), smr.ser, smr.len) < 0) { - CtdlLogPrintf(CTDL_ERR, "Can't store message\n"); + syslog(LOG_ERR, "Can't store message\n"); retval = 0L; } else { if (is_bigmsg) { @@ -2635,7 +2889,7 @@ void serialize_message(struct ser_ret *ret, /* return values */ * Check for valid message format */ if (is_valid_message(msg) == 0) { - CtdlLogPrintf(CTDL_ERR, "serialize_message() aborting due to invalid message\n"); + syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n"); ret->len = 0; ret->ser = NULL; return; @@ -2648,7 +2902,7 @@ void serialize_message(struct ser_ret *ret, /* return values */ ret->ser = malloc(ret->len); if (ret->ser == NULL) { - CtdlLogPrintf(CTDL_ERR, "serialize_message() malloc(%ld) failed: %s\n", + syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n", (long)ret->len, strerror(errno)); ret->len = 0; ret->ser = NULL; @@ -2666,7 +2920,7 @@ void serialize_message(struct ser_ret *ret, /* return values */ safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1); wlen = wlen + fieldlen + 1; } - if (ret->len != wlen) CtdlLogPrintf(CTDL_ERR, "ERROR: len=%ld wlen=%ld\n", + if (ret->len != wlen) syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n", (long)ret->len, (long)wlen); return; @@ -2683,7 +2937,6 @@ void serialize_message(struct ser_ret *ret, /* return values */ void dump_message(struct CtdlMessage *msg, /* unserialized msg */ long Siz) /* how many chars ? */ { - size_t wlen; int i; static char *forder = FORDER; char *buf; @@ -2692,18 +2945,20 @@ void dump_message(struct CtdlMessage *msg, /* unserialized msg */ * Check for valid message format */ if (is_valid_message(msg) == 0) { - CtdlLogPrintf(CTDL_ERR, "dump_message() aborting due to invalid message\n"); + syslog(LOG_ERR, "dump_message() aborting due to invalid message\n"); return; } buf = (char*) malloc (Siz + 1); - wlen = 3; - for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) { snprintf (buf, Siz, " msg[%c] = %s ...\n", (char) forder[i], msg->cm_fields[(int)forder[i]]); - client_write (buf, strlen(buf)); + if (client_write (buf, strlen(buf)) == -1) + { + syslog(LOG_ERR, "dump_message(): aborting due to write failure.\n"); + return; + } } return; @@ -2720,19 +2975,19 @@ void ReplicationChecks(struct CtdlMessage *msg) { if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return; - CtdlLogPrintf(CTDL_DEBUG, "Performing replication checks in <%s>\n", + syslog(LOG_DEBUG, "Performing replication checks in <%s>\n", CC->room.QRname); /* No exclusive id? Don't do anything. */ if (msg == NULL) return; if (msg->cm_fields['E'] == NULL) return; if (IsEmptyStr(msg->cm_fields['E'])) return; - /*CtdlLogPrintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n", + /*syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n", msg->cm_fields['E'], CC->room.QRname);*/ old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CC->room); if (old_msgnum > 0L) { - CtdlLogPrintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); + syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, ""); } } @@ -2744,7 +2999,7 @@ void ReplicationChecks(struct CtdlMessage *msg) { */ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ struct recptypes *recps, /* recipients (if mail) */ - char *force, /* force a particular room? */ + const char *force, /* force a particular room? */ int flags /* should the message be exported clean? */ ) { char submit_filename[128]; @@ -2770,12 +3025,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ struct addresses_to_be_filed *aptr = NULL; StrBuf *saved_rfc822_version = NULL; int qualified_for_journaling = 0; - CitContext *CCC = CC; /* CachedCitContext - performance boost */ + CitContext *CCC = MyContext(); char bounce_to[1024] = ""; size_t tmp = 0; int rv = 0; - CtdlLogPrintf(CTDL_DEBUG, "CtdlSubmitMsg() called\n"); + syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n"); if (is_valid_message(msg) == 0) return(-1); /* self check */ /* If this message has no timestamp, we take the liberty of @@ -2811,7 +3066,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Learn about what's inside, because it's what's inside that counts */ if (msg->cm_fields['M'] == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: attempt to save message with NULL body\n"); + syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n"); return(-2); } @@ -2843,7 +3098,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Goto the correct room */ - CtdlLogPrintf(CTDL_DEBUG, "Selected room %s\n", (recps) ? CCC->room.QRname : SENTITEMS); + syslog(LOG_DEBUG, "Selected room %s\n", (recps) ? CCC->room.QRname : SENTITEMS); strcpy(hold_rm, CCC->room.QRname); strcpy(actual_rm, CCC->room.QRname); if (recps != NULL) { @@ -2855,7 +3110,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (CCC->user.axlevel == AxProbU) { strcpy(hold_rm, actual_rm); strcpy(actual_rm, config.c_twitroom); - CtdlLogPrintf(CTDL_DEBUG, "Diverting to twit room\n"); + syslog(LOG_DEBUG, "Diverting to twit room\n"); } } @@ -2864,7 +3119,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ strcpy(actual_rm, force_room); } - CtdlLogPrintf(CTDL_DEBUG, "Final selection: %s\n", actual_rm); + syslog(LOG_DEBUG, "Final selection: %s\n", actual_rm); if (strcasecmp(actual_rm, CCC->room.QRname)) { /* CtdlGetRoom(&CCC->room, actual_rm); */ CtdlUserGoto(actual_rm, 0, 1, NULL, NULL); @@ -2878,7 +3133,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Perform "before save" hooks (aborting if any return nonzero) */ - CtdlLogPrintf(CTDL_DEBUG, "Performing before-save hooks\n"); + syslog(LOG_DEBUG, "Performing before-save hooks\n"); if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3); /* @@ -2890,7 +3145,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Save it to disk */ - CtdlLogPrintf(CTDL_DEBUG, "Saving to disk\n"); + syslog(LOG_DEBUG, "Saving to disk\n"); newmsgid = send_message(msg); if (newmsgid <= 0L) return(-5); @@ -2898,7 +3153,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * be a critical section because nobody else knows about this message * yet. */ - CtdlLogPrintf(CTDL_DEBUG, "Creating MetaData record\n"); + syslog(LOG_DEBUG, "Creating MetaData record\n"); memset(&smi, 0, sizeof(struct MetaData)); smi.meta_msgnum = newmsgid; smi.meta_refcount = 0; @@ -2916,7 +3171,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * message to attach to the journalized copy. */ if (CCC->redirect_buffer != NULL) { - CtdlLogPrintf(CTDL_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n"); + syslog(LOG_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n"); abort(); } CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ); @@ -2928,7 +3183,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ PutMetaData(&smi); /* Now figure out where to store the pointers */ - CtdlLogPrintf(CTDL_DEBUG, "Storing pointers\n"); + syslog(LOG_DEBUG, "Storing pointers\n"); /* If this is being done by the networker delivering a private * message, we want to BYPASS saving the sender's copy (because there @@ -2936,7 +3191,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ */ if ((!CCC->internal_pgm) || (recps == NULL)) { if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) { - CtdlLogPrintf(CTDL_ERR, "ERROR saving message pointer!\n"); + syslog(LOG_ERR, "ERROR saving message pointer!\n"); CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); } } @@ -2951,12 +3206,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_room, '|'); ++i) { extract_token(recipient, recps->recp_room, i, '|', sizeof recipient); - CtdlLogPrintf(CTDL_DEBUG, "Delivering to room <%s>\n", recipient); + syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient); CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg); } /* Bump this user's messages posted counter. */ - CtdlLogPrintf(CTDL_DEBUG, "Updating user\n"); + syslog(LOG_DEBUG, "Updating user\n"); CtdlGetUserLock(&CCC->user, CCC->curr_user); CCC->user.posted = CCC->user.posted + 1; CtdlPutUserLock(&CCC->user); @@ -2979,7 +3234,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_local, '|'); ++i) { extract_token(recipient, recps->recp_local, i, '|', sizeof recipient); - CtdlLogPrintf(CTDL_DEBUG, "Delivering private local mail to <%s>\n", + syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n", recipient); if (CtdlGetUser(&userbuf, recipient) == 0) { // Add a flag so the Funambol module knows its mail @@ -3014,14 +3269,14 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } } else { - CtdlLogPrintf(CTDL_DEBUG, "No user <%s>\n", recipient); + syslog(LOG_DEBUG, "No user <%s>\n", recipient); CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); } } /* Perform "after save" hooks */ - CtdlLogPrintf(CTDL_DEBUG, "Performing after-save hooks\n"); + syslog(LOG_DEBUG, "Performing after-save hooks\n"); PerformMessageHooks(msg, EVT_AFTERSAVE); /* For IGnet mail, we have to save a new copy into the spooler for @@ -3053,6 +3308,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ network_fp = fopen(submit_filename, "wb+"); if (network_fp != NULL) { rv = fwrite(smr.ser, smr.len, 1, network_fp); + if (rv == -1) { + syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n", + strerror(errno)); + } fclose(network_fp); } free(smr.ser); @@ -3065,7 +3324,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Go back to the room we started from */ - CtdlLogPrintf(CTDL_DEBUG, "Returning to original room %s\n", hold_rm); + syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm); if (strcasecmp(hold_rm, CCC->room.QRname)) CtdlUserGoto(hold_rm, 0, 1, NULL, NULL); @@ -3075,7 +3334,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * contain a recipient. */ if ((recps != NULL) && (recps->num_internet > 0)) { - CtdlLogPrintf(CTDL_DEBUG, "Generating delivery instructions\n"); + syslog(LOG_DEBUG, "Generating delivery instructions\n"); instr_alloc = 1024; instr = malloc(instr_alloc); snprintf(instr, instr_alloc, @@ -3258,7 +3517,7 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */ /* read in the lines of message text one by one */ do { if (sock != NULL) { - if ((CtdlSockGetLine(sock, LineBuf) < 0) || + if ((CtdlSockGetLine(sock, LineBuf, 5) < 0) || (*sock == -1)) finished = 1; } @@ -3296,6 +3555,170 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */ return Message; } +void DeleteAsyncMsg(ReadAsyncMsg **Msg) +{ + if (*Msg == NULL) + return; + FreeStrBuf(&(*Msg)->MsgBuf); + + free(*Msg); + *Msg = NULL; +} + +ReadAsyncMsg *NewAsyncMsg(const char *terminator, /* token signalling EOT */ + long tlen, + size_t maxlen, /* maximum message length */ + size_t expectlen, /* if we expect a message, how long should it be? */ + char *exist, /* if non-null, append to it; + exist is ALWAYS freed */ + long eLen, /* length of exist */ + int crlf /* CRLF newlines instead of LF */ + ) +{ + ReadAsyncMsg *NewMsg; + + NewMsg = (ReadAsyncMsg *)malloc(sizeof(ReadAsyncMsg)); + memset(NewMsg, 0, sizeof(ReadAsyncMsg)); + + if (exist == NULL) { + long len; + + if (expectlen == 0) { + len = 4 * SIZ; + } + else { + len = expectlen + 10; + } + NewMsg->MsgBuf = NewStrBufPlain(NULL, len); + } + else { + NewMsg->MsgBuf = NewStrBufPlain(exist, eLen); + free(exist); + } + /* Do we need to change leading ".." to "." for SMTP escaping? */ + if ((tlen == 1) && (*terminator == '.')) { + NewMsg->dodot = 1; + } + + NewMsg->terminator = terminator; + NewMsg->tlen = tlen; + + NewMsg->maxlen = maxlen; + + NewMsg->crlf = crlf; + + return NewMsg; +} + +/* + * Back end function used by CtdlMakeMessage() and similar functions + */ +eReadState CtdlReadMessageBodyAsync(AsyncIO *IO) +{ + ReadAsyncMsg *ReadMsg; + int MsgFinished = 0; + eReadState Finished = eMustReadMore; + +#ifdef BIGBAD_IODBG + char fn [SIZ]; + FILE *fd; + const char *pch = ChrPtr(IO->SendBuf.Buf); + const char *pchh = IO->SendBuf.ReadWritePointer; + long nbytes; + + if (pchh == NULL) + pchh = pch; + + nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch); + snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d", + ((CitContext*)(IO->CitContext))->ServiceName, + IO->SendBuf.fd); + + fd = fopen(fn, "a+"); +#endif + + ReadMsg = IO->ReadMsg; + + /* read in the lines of message text one by one */ + do { + Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf); + + switch (Finished) { + case eMustReadMore: /// read new from socket... +#ifdef BIGBAD_IODBG + if (IO->RecvBuf.ReadWritePointer != NULL) { + nbytes = StrLength(IO->RecvBuf.Buf) - (IO->RecvBuf.ReadWritePointer - ChrPtr(IO->RecvBuf.Buf)); + fprintf(fd, "Read; Line unfinished: %ld Bytes still in buffer [", nbytes); + + fwrite(IO->RecvBuf.ReadWritePointer, nbytes, 1, fd); + + fprintf(fd, "]\n"); + } else { + fprintf(fd, "BufferEmpty! \n"); + } + fclose(fd); +#endif + return Finished; + break; + case eBufferNotEmpty: /* shouldn't happen... */ + case eReadSuccess: /// done for now... + break; + case eReadFail: /// WHUT? + ///todo: shut down! + break; + } + + + if ((StrLength(IO->IOBuf) == ReadMsg->tlen) && + (!strcmp(ChrPtr(IO->IOBuf), ReadMsg->terminator))) { + MsgFinished = 1; +#ifdef BIGBAD_IODBG + fprintf(fd, "found Terminator; Message Size: %d\n", StrLength(ReadMsg->MsgBuf)); +#endif + } + else if (!ReadMsg->flushing) { + +#ifdef BIGBAD_IODBG + fprintf(fd, "Read Line: [%d][%s]\n", StrLength(IO->IOBuf), ChrPtr(IO->IOBuf)); +#endif + + /* Unescape SMTP-style input of two dots at the beginning of the line */ + if ((ReadMsg->dodot) && + (StrLength(IO->IOBuf) == 2) && /* TODO: do we just unescape lines with two dots or any line? */ + (!strcmp(ChrPtr(IO->IOBuf), ".."))) + { +#ifdef BIGBAD_IODBG + fprintf(fd, "UnEscaped!\n"); +#endif + StrBufCutLeft(IO->IOBuf, 1); + } + + if (ReadMsg->crlf) { + StrBufAppendBufPlain(IO->IOBuf, HKEY("\r\n"), 0); + } + else { + StrBufAppendBufPlain(IO->IOBuf, HKEY("\n"), 0); + } + + StrBufAppendBuf(ReadMsg->MsgBuf, IO->IOBuf, 0); + } + + /* if we've hit the max msg length, flush the rest */ + if (StrLength(ReadMsg->MsgBuf) >= ReadMsg->maxlen) ReadMsg->flushing = 1; + + } while (!MsgFinished); + +#ifdef BIGBAD_IODBG + fprintf(fd, "Done with reading; %s.\n, ", + (MsgFinished)?"Message Finished": "FAILED"); + fclose(fd); +#endif + if (MsgFinished) + return eReadSuccess; + else + return eAbort; +} + /* * Back end function used by CtdlMakeMessage() and similar functions @@ -3349,6 +3772,8 @@ struct CtdlMessage *CtdlMakeMessage( char dest_node[256]; char buf[1024]; struct CtdlMessage *msg; + StrBuf *FakeAuthor; + StrBuf *FakeEncAuthor = NULL; msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); @@ -3378,11 +3803,14 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_fields['T'] = strdup(buf); if ((fake_name != NULL) && (fake_name[0])) { /* author */ - msg->cm_fields['A'] = strdup(fake_name); + FakeAuthor = NewStrBufPlain (fake_name, -1); } else { - msg->cm_fields['A'] = strdup(author->fullname); + FakeAuthor = NewStrBufPlain (author->fullname, -1); } + StrBufRFC2047encode(&FakeEncAuthor, FakeAuthor); + msg->cm_fields['A'] = SmashStrBuf(&FakeEncAuthor); + FreeStrBuf(&FakeAuthor); if (CC->room.QRflags & QR_MAILBOX) { /* room */ msg->cm_fields['O'] = strdup(&CC->room.QRname[11]); @@ -3459,10 +3887,13 @@ struct CtdlMessage *CtdlMakeMessage( * room. Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or * returns 0 on success. */ -int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, - size_t n, - const char* RemoteIdentifier, - int PostPublic) { +int CtdlDoIHavePermissionToPostInThisRoom( + char *errmsgbuf, + size_t n, + const char* RemoteIdentifier, + int PostPublic, + int is_reply +) { int ra; if (!(CC->logged_in) && @@ -3521,19 +3952,36 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, if ((CC->user.axlevel < AxProbU) && ((CC->room.QRflags & QR_MAILBOX) == 0)) { - snprintf(errmsgbuf, n, "Need to be validated to enter " - "(except in %s> to sysop)", MAILROOM); + snprintf(errmsgbuf, n, "Need to be validated to enter (except in %s> to sysop)", MAILROOM); return (ERROR + HIGHER_ACCESS_REQUIRED); } CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL); - if (!(ra & UA_POSTALLOWED)) { - snprintf(errmsgbuf, n, "Higher access is required to post in this room."); + + if (ra & UA_POSTALLOWED) { + strcpy(errmsgbuf, "OK to post or reply here"); + return(0); + } + + if ( (ra & UA_REPLYALLOWED) && (is_reply) ) { + /* + * To be thorough, we ought to check to see if the message they are + * replying to is actually a valid one in this room, but unless this + * actually becomes a problem we'll go with high performance instead. + */ + strcpy(errmsgbuf, "OK to reply here"); + return(0); + } + + if ( (ra & UA_REPLYALLOWED) && (!is_reply) ) { + /* Clarify what happened with a better error message */ + snprintf(errmsgbuf, n, "You may only reply to existing messages here."); return (ERROR + HIGHER_ACCESS_REQUIRED); } - strcpy(errmsgbuf, "Ok"); - return(0); + snprintf(errmsgbuf, n, "Higher access is required to post in this room."); + return (ERROR + HIGHER_ACCESS_REQUIRED); + } @@ -3652,7 +4100,7 @@ struct recptypes *validate_recipients(const char *supplied_recipients, striplt(this_recp); if (IsEmptyStr(this_recp)) break; - CtdlLogPrintf(CTDL_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); + syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); ++num_recps; mailtype = alias(this_recp); mailtype = alias(this_recp); @@ -3687,10 +4135,12 @@ struct recptypes *validate_recipients(const char *supplied_recipients, CC->room = tempQR; /* Check permissions to send mail to this room */ - err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, - sizeof errmsg, - RemoteIdentifier, - Flags + err = CtdlDoIHavePermissionToPostInThisRoom( + errmsg, + sizeof errmsg, + RemoteIdentifier, + Flags, + 0 /* 0 = not a reply */ ); if (err) { @@ -3794,12 +4244,12 @@ struct recptypes *validate_recipients(const char *supplied_recipients, strcpy(ret->errormsg, "No recipients specified."); } - CtdlLogPrintf(CTDL_DEBUG, "validate_recipients()\n"); - CtdlLogPrintf(CTDL_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); - CtdlLogPrintf(CTDL_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); - CtdlLogPrintf(CTDL_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); - CtdlLogPrintf(CTDL_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); - CtdlLogPrintf(CTDL_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); + syslog(LOG_DEBUG, "validate_recipients()\n"); + syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); + syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); + syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); + syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); + syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); free(recipients); return(ret); @@ -3816,7 +4266,7 @@ void free_recipients(struct recptypes *valid) { } if (valid->recptypes_magic != RECPTYPES_MAGIC) { - CtdlLogPrintf(CTDL_EMERG, "Attempt to call free_recipients() on some other data type!\n"); + syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n"); abort(); } @@ -3893,7 +4343,13 @@ void cmd_ent0(char *entargs) /* first check to make sure the request is valid. */ - err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, sizeof errmsg, NULL, POST_LOGGED_IN); + err = CtdlDoIHavePermissionToPostInThisRoom( + errmsg, + sizeof errmsg, + NULL, + POST_LOGGED_IN, + (!IsEmptyStr(references)) /* is this a reply? or a top-level post? */ + ); if (err) { cprintf("%d %s\n", err, errmsg); @@ -3949,12 +4405,13 @@ void cmd_ent0(char *entargs) /* 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). We do this for the Mail> room, as - * well as any room which has the "Mailbox" view set. + * well as any room which has the "Mailbox" view set - unless it + * is the DRAFTS room which does not require recipients */ - if ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) ) - || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) ) - ) { + if ( ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) ) + || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) ) + ) && (strcasecmp(&CC->room.QRname[11], USERDRAFTROOM)) !=0 ) { if (CC->user.axlevel < AxProbU) { strcpy(recp, "sysop"); strcpy(cc, ""); @@ -4166,12 +4623,12 @@ int CtdlDeleteMessages(char *room_name, /* which room */ regcomp(&re, content_type, 0); need_to_free_re = 1; } - CtdlLogPrintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n", + syslog(LOG_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n", room_name, num_dmsgnums, content_type); /* get room record, obtaining a lock... */ if (CtdlGetRoomLock(&qrbuf, room_name) != 0) { - CtdlLogPrintf(CTDL_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", + syslog(LOG_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", room_name); if (need_to_free_re) regfree(&re); return (0); /* room not found */ @@ -4248,7 +4705,7 @@ int CtdlDeleteMessages(char *room_name, /* which room */ /* Now free the memory we used, and go away. */ if (msglist != NULL) free(msglist); if (dellist != NULL) free(dellist); - CtdlLogPrintf(CTDL_DEBUG, "%d message(s) deleted.\n", num_deleted); + syslog(LOG_DEBUG, "%d message(s) deleted.\n", num_deleted); if (need_to_free_re) regfree(&re); return (num_deleted); } @@ -4482,7 +4939,7 @@ void AdjRefCount(long msgnum, int incr) struct arcq new_arcq; int rv = 0; - CtdlLogPrintf(CTDL_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", + syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", msgnum, incr ); @@ -4494,7 +4951,7 @@ void AdjRefCount(long msgnum, int incr) /* msgnum < 0 means that we're trying to close the file */ if (msgnum < 0) { - CtdlLogPrintf(CTDL_DEBUG, "Closing the AdjRefCount queue file\n"); + syslog(LOG_DEBUG, "Closing the AdjRefCount queue file\n"); begin_critical_section(S_SUPPMSGMAIN); if (arcfp != NULL) { fclose(arcfp); @@ -4515,6 +4972,11 @@ void AdjRefCount(long msgnum, int incr) new_arcq.arcq_msgnum = msgnum; new_arcq.arcq_delta = incr; rv = fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp); + if (rv == -1) { + syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n", + file_arcq, + strerror(errno)); + } fflush(arcfp); return; @@ -4546,7 +5008,7 @@ int TDAP_ProcessAdjRefCountQueue(void) r = link(file_arcq, file_arcq_temp); if (r != 0) { - CtdlLogPrintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); end_critical_section(S_SUPPMSGMAIN); return(num_records_processed); } @@ -4556,7 +5018,7 @@ int TDAP_ProcessAdjRefCountQueue(void) fp = fopen(file_arcq_temp, "rb"); if (fp == NULL) { - CtdlLogPrintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); return(num_records_processed); } @@ -4568,7 +5030,7 @@ int TDAP_ProcessAdjRefCountQueue(void) fclose(fp); r = unlink(file_arcq_temp); if (r != 0) { - CtdlLogPrintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); } return(num_records_processed); @@ -4599,7 +5061,7 @@ void TDAP_AdjRefCount(long msgnum, int incr) smi.meta_refcount += incr; PutMetaData(&smi); end_critical_section(S_SUPPMSGMAIN); - CtdlLogPrintf(CTDL_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n", + syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n", msgnum, incr, smi.meta_refcount ); @@ -4607,7 +5069,7 @@ void TDAP_AdjRefCount(long msgnum, int incr) * (and its supplementary record as well). */ if (smi.meta_refcount == 0) { - CtdlLogPrintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum); + syslog(LOG_DEBUG, "Deleting message <%ld>\n", msgnum); /* Call delete hooks with NULL room to show it has gone altogether */ PerformDeleteHooks(NULL, msgnum); @@ -4653,7 +5115,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ safestrncpy(roomname, req_room, sizeof(roomname)); } - CtdlLogPrintf(CTDL_DEBUG, "Raw length is %ld\n", (long)raw_length); + syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length); if (is_binary) { encoded_message = malloc((size_t) (((raw_length * 134) / 100) + 4096 ) ); @@ -4691,7 +5153,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ ); } - CtdlLogPrintf(CTDL_DEBUG, "Allocating\n"); + syslog(LOG_DEBUG, "Allocating\n"); msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); msg->cm_magic = CTDLMESSAGE_MAGIC; @@ -4715,7 +5177,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ * other objects of this type that are currently in the room. */ if (is_unique) { - CtdlLogPrintf(CTDL_DEBUG, "Deleted %d other msgs of this type\n", + syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n", CtdlDeleteMessages(roomname, NULL, 0, content_type) ); } @@ -4856,5 +5318,5 @@ CTDL_MODULE_INIT(msgbase) } /* return our Subversion id for the Log */ - return "$Id$"; + return "msgbase"; }