X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=5ec0801d20038b45cd3f2b3ebc768081bb99452b;hb=f1ee61891901850ebbdee1e9440b363dc6df540a;hp=fc7b625e585c806b1cd76d2b7c402a3a5713aa2b;hpb=2d03b6864a657a706b8d2917d912e579b2298025;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index fc7b625e5..5ec0801d2 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -198,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 */ @@ -206,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); } } } @@ -404,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, @@ -441,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(); @@ -574,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) { @@ -940,13 +940,13 @@ void memfmout( if (ch == '\n') { if (client_write(outbuf, len) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } len = 0; if (client_write(nl, nllen) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } column = 0; @@ -958,13 +958,13 @@ void memfmout( if (column > 72) { /* Beyond 72 columns, break on the next space */ if (client_write(outbuf, len) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } len = 0; if (client_write(nl, nllen) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } column = 0; @@ -980,13 +980,13 @@ void memfmout( if (column > 1000) { /* Beyond 1000 columns, break anywhere */ if (client_write(outbuf, len) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } len = 0; if (client_write(nl, nllen) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } column = 0; @@ -996,7 +996,7 @@ void memfmout( if (len) { if (client_write(outbuf, len) == -1) { - CtdlLogPrintf(CTDL_ERR, "memfmout(): aborting due to write failure.\n"); + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } len = 0; @@ -1185,11 +1185,11 @@ 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); #ifdef MESSAGE_IN_ROOM if (!CtdlMessageInRoom(msgnum)) { - CtdlLogPrintf(CTDL_DEBUG, "Message %ld not in current room\n", msgnum); + syslog(LOG_DEBUG, "Message %ld not in current room\n", msgnum); return NULL; } #endif @@ -1208,7 +1208,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; } @@ -1272,7 +1272,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; @@ -1319,7 +1319,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; @@ -1339,7 +1339,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; @@ -1363,7 +1363,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); @@ -1372,7 +1372,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; @@ -1444,7 +1444,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; } @@ -1522,7 +1522,7 @@ void output_preferred(char *name, cprintf("\n"); if (client_write(text_content, length) == -1) { - CtdlLogPrintf(CTDL_ERR, "output_preferred(): aborting due to write failure.\n"); + syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n"); return; } if (add_newline) cprintf("\n"); @@ -1615,7 +1615,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 : "<>") ); @@ -1635,7 +1635,7 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ #ifdef MESSAGE_IN_ROOM if (!CtdlMessageInRoom(msg_num)) { - CtdlLogPrintf(CTDL_DEBUG, "Message %ld not in current room\n", msg_num); + syslog(LOG_DEBUG, "Message %ld not in current room\n", msg_num); if (do_proto) cprintf("%d Can't locate msg %ld in room\n", ERROR + MESSAGE_NOT_FOUND, msg_num); return(om_no_such_msg); @@ -1722,7 +1722,7 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; cit_backtrace(); - CtdlLogPrintf(CTDL_DEBUG, "qp_encode_email_addrs: [%s]\n", source); + syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source); AddrPtr = malloc (sizeof (long) * nAddrPtrMax); AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); @@ -2098,7 +2098,7 @@ void Dump_RFC822HeadersBody( if (outlen > 1000) { if (client_write(outbuf, outlen) == -1) { - CtdlLogPrintf(CTDL_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n"); + syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n"); return; } outlen = 0; @@ -2169,7 +2169,7 @@ void DumpFormatFixed( if (client_write(buf, buflen) == -1) { - CtdlLogPrintf(CTDL_ERR, "DumpFormatFixed(): aborting due to write failure.\n"); + syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n"); return; } *buf = '\0'; @@ -2211,7 +2211,7 @@ int CtdlOutputPreLoadedMsg( char snode[100]; char mid[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); @@ -2219,7 +2219,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); @@ -2613,7 +2613,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 ); @@ -2629,7 +2629,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); } @@ -2666,14 +2666,14 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms } } - CtdlLogPrintf(CTDL_DEBUG, "%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; @@ -2697,7 +2697,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; ilen = 0; ret->ser = NULL; return; @@ -2872,7 +2872,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; @@ -2890,7 +2890,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; @@ -2916,7 +2916,7 @@ 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; } @@ -2929,7 +2929,7 @@ void dump_message(struct CtdlMessage *msg, /* unserialized msg */ msg->cm_fields[(int)forder[i]]); if (client_write (buf, strlen(buf)) == -1) { - CtdlLogPrintf(CTDL_ERR, "dump_message(): aborting due to write failure.\n"); + syslog(LOG_ERR, "dump_message(): aborting due to write failure.\n"); return; } } @@ -2948,19 +2948,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, ""); } } @@ -3003,7 +3003,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ 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 @@ -3039,7 +3039,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); } @@ -3071,7 +3071,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) { @@ -3083,7 +3083,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"); } } @@ -3092,7 +3092,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); @@ -3106,7 +3106,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); /* @@ -3118,7 +3118,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); @@ -3126,7 +3126,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; @@ -3144,7 +3144,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); @@ -3156,7 +3156,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 @@ -3164,7 +3164,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); } } @@ -3179,12 +3179,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); @@ -3207,7 +3207,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 @@ -3242,14 +3242,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 @@ -3293,7 +3293,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); @@ -3303,7 +3303,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, @@ -4063,7 +4063,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); @@ -4207,12 +4207,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); @@ -4229,7 +4229,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(); } @@ -4586,12 +4586,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 */ @@ -4668,7 +4668,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); } @@ -4902,7 +4902,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 ); @@ -4914,7 +4914,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); @@ -4966,7 +4966,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); } @@ -4976,7 +4976,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); } @@ -4988,7 +4988,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); @@ -5019,7 +5019,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 ); @@ -5027,7 +5027,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); @@ -5073,7 +5073,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 ) ); @@ -5111,7 +5111,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; @@ -5135,7 +5135,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) ); }