X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=dd6c5a8301cc641f1985dd9fa465521a0d587495;hb=a5af9f49e3f26d36a6364a4b7fce9a57f5114d5b;hp=7b46dbee55872d098d1fdc2455e6c4dcfaee24e0;hpb=4ca1b68a1524341fabc768480dee8ecba105aa73;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 7b46dbee5..dd6c5a830 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -64,7 +64,6 @@
 #include "journaling.h"
 #include "citadel_dirs.h"
 #include "clientsocket.h"
-#include "serv_network.h"
 #include "threads.h"
 
 #include "ctdl_module.h"
@@ -75,13 +74,6 @@ 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.
- */
-struct FilterList *filterlist = NULL;
-
-
 /*
  * These are the four-character field headers we use when outputting
  * messages in Citadel format (as opposed to RFC822 format).
@@ -593,56 +585,6 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
 }
 
 
-
-/* store a value in the binary tree */
-void seenit_store(struct seenit **si, long msgnum) {
-	struct seenit *this_si;
-
-	if (*si == NULL) {			/* store now */
-		*si = malloc(sizeof(struct seenit));
-		this_si = *si;
-		this_si->l = NULL;
-		this_si->r = NULL;
-		this_si->msgnum = msgnum;
-		return;
-	}
-
-	this_si = *si;
-	if (msgnum < this_si->msgnum) {
-		seenit_store(&this_si->l, msgnum);
-	}
-	else if (msgnum > this_si->msgnum) {
-		seenit_store(&this_si->r, msgnum);
-	}
-	else {
-		return;
-	}
-}
-
-
-/* search for a value in the binary tree */
-int seenit_isthere(struct seenit *si, long msgnum) {
-	if (!si) return(0);	/* not there */
-	if (msgnum < si->msgnum) return(seenit_isthere(si->l, msgnum));
-	if (msgnum > si->msgnum) return(seenit_isthere(si->r, msgnum));
-	return(1);		/* found it */
-}
-
-
-/* free the binary tree */
-void seenit_free(struct seenit **si) {
-	struct seenit *this_si = *si;
-	if (!this_si) return;
-	seenit_free(&this_si->l);
-	seenit_free(&this_si->r);
-	free(this_si);
-	*si = NULL;
-}
-
-
-
-
-
 /*
  * API function to perform an operation for each qualifying message in the
  * current room.  (Returns the number of messages processed.)
@@ -699,13 +641,6 @@ int CtdlForEachMessage(int mode, long ref, char *search_string,
 	 */
 	if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
 
-		/*
-		 * cache the msgnums we've seen in order to perform security checks later
-		 */
-		if (CC->client_socket > 0) {
-			seenit_store(&CC->cached_msglist, msglist[a]);
-		}
-
 		/* If the caller is looking for a specific MIME type, filter
 		 * out all messages which are not of the type requested.
 	 	 */
@@ -832,7 +767,21 @@ int CtdlForEachMessage(int mode, long ref, char *search_string,
 			}
 		}
 	if (need_to_free_re) regfree(&re);
-	free(msglist);
+
+	/*
+	 * 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;
 }
 
@@ -1149,6 +1098,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);
 	
@@ -1401,7 +1354,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp,
 		ptr = html_to_ascii(content, length, 80, 0);
 		wlen = strlen(ptr);
 		client_write(ptr, wlen);
-		if (ptr[wlen-1] != '\n') {
+		if ((wlen > 0) && (ptr[wlen-1] != '\n')) {
 			cprintf("\n");
 		}
 		free(ptr);
@@ -1601,9 +1554,24 @@ int check_cached_msglist(long msgnum) {
 	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 */
 
-	if (seenit_isthere(CC->cached_msglist, msgnum)) {
-		return om_ok;
+
+	/* 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;
@@ -1660,21 +1628,28 @@ int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
 		return(r);
 	}
 
+	/*
+	 * 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, "Denying access to message %ld - not yet listed\n", msg_num);
+		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 + MESSAGE_NOT_FOUND,
+				cprintf("%d message %ld was not found in this room\n",
+					ERROR + HIGHER_ACCESS_REQUIRED,
 					msg_num
 				);
 			}
-			else {
-				cprintf("%d An unknown error has occurred.\n", ERROR);
-			}
-		return(r);
 		}
+		return(r);
 	}
 
 	/*
@@ -1976,6 +1951,7 @@ void OutputRFC822MsgHeaders(
 	int i, j, k;
 	char *mptr = NULL;
 	char *mpptr = NULL;
+	char *hptr;
 
 	for (i = 0; i < 256; ++i) {
 		if (TheMessage->cm_fields[i]) {
@@ -2001,7 +1977,11 @@ void OutputRFC822MsgHeaders(
 			else if (i == 'V') {
 				if ((flags & QP_EADDR) != 0) 
 					mptr = qp_encode_email_addrs(mptr);
-				cprintf("Envelope-To: %s%s", mptr, nl);
+				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);
@@ -2054,7 +2034,11 @@ void OutputRFC822MsgHeaders(
 				}
 			}
 			else if (i == 'K') {
-				cprintf("Reply-To: <%s>%s", mptr, nl);
+				hptr = mptr;
+				while ((*hptr != '\0') && isspace(*hptr))
+					hptr ++;
+				if (!IsEmptyStr(hptr))
+					cprintf("Reply-To: %s%s", mptr, nl);
 			}
 			if (mptr != mpptr)
 				free (mptr);
@@ -2080,7 +2064,6 @@ void Dump_RFC822HeadersBody(
 	int outlen = 0;
 	int nllen = strlen(nl);
 	char *mptr;
-	int rc;
 
 	mptr = TheMessage->cm_fields['M'];
 
@@ -2140,7 +2123,7 @@ void Dump_RFC822HeadersBody(
 		}
 	}
 	if (outlen > 0) {
-		rc = client_write(outbuf, outlen);
+		client_write(outbuf, outlen);
 		outlen = 0;
 	}
 }
@@ -2793,7 +2776,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
  * a single message.
  */
 int CtdlSaveMsgPointerInRoom(char *roomname, long msgid,
-			int do_repl_check, struct CtdlMessage *supplied_msg)
+			     int do_repl_check, struct CtdlMessage *supplied_msg)
 {
 	return CtdlSaveMsgPointersInRoom(roomname, &msgid, 1, do_repl_check, supplied_msg, 0);
 }
@@ -2819,7 +2802,11 @@ long send_message(struct CtdlMessage *msg) {
 
 	/* Get a new message number */
 	newmsgid = get_new_message_number();
-	snprintf(msgidbuf, sizeof msgidbuf, "%010ld@%s", newmsgid, config.c_fqdn);
+	snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s",
+		 (long unsigned int) time(NULL),
+		 (long unsigned int) newmsgid,
+		 config.c_fqdn
+		);
 
 	/* Generate an ID if we don't have one already */
 	if (msg->cm_fields['I']==NULL) {
@@ -2856,11 +2843,11 @@ long send_message(struct CtdlMessage *msg) {
 	} else {
 		if (is_bigmsg) {
 			cdb_store(CDB_BIGMSGS,
-				&newmsgid,
-				(int)sizeof(long),
-				holdM,
-				(strlen(holdM) + 1)
-			);
+				  &newmsgid,
+				  (int)sizeof(long),
+				  holdM,
+				  (strlen(holdM) + 1)
+				);
 		}
 		retval = newmsgid;
 	}
@@ -2884,7 +2871,7 @@ long send_message(struct CtdlMessage *msg) {
  * serialized message in memory.  THE LATTER MUST BE FREED BY THE CALLER.
  */
 void serialize_message(struct ser_ret *ret,		/* return values */
-			struct CtdlMessage *msg)	/* unserialized msg */
+		       struct CtdlMessage *msg)	/* unserialized msg */
 {
 	size_t wlen, fieldlen;
 	int i;
@@ -2902,13 +2889,13 @@ void serialize_message(struct ser_ret *ret,		/* return values */
 
 	ret->len = 3;
 	for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL)
-		ret->len = ret->len +
-			strlen(msg->cm_fields[(int)forder[i]]) + 2;
+				     ret->len = ret->len +
+					     strlen(msg->cm_fields[(int)forder[i]]) + 2;
 
 	ret->ser = malloc(ret->len);
 	if (ret->ser == NULL) {
 		syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n",
-			(long)ret->len, strerror(errno));
+		       (long)ret->len, strerror(errno));
 		ret->len = 0;
 		ret->ser = NULL;
 		return;
@@ -2920,13 +2907,13 @@ void serialize_message(struct ser_ret *ret,		/* return values */
 	wlen = 3;
 
 	for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
-		fieldlen = strlen(msg->cm_fields[(int)forder[i]]);
-		ret->ser[wlen++] = (char)forder[i];
-		safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1);
-		wlen = wlen + fieldlen + 1;
-	}
+			fieldlen = strlen(msg->cm_fields[(int)forder[i]]);
+			ret->ser[wlen++] = (char)forder[i];
+			safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1);
+			wlen = wlen + fieldlen + 1;
+		}
 	if (ret->len != wlen) syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n",
-		(long)ret->len, (long)wlen);
+				     (long)ret->len, (long)wlen);
 
 	return;
 }
@@ -2942,7 +2929,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;
@@ -2957,8 +2943,6 @@ void dump_message(struct CtdlMessage *msg,	/* unserialized msg */
 
 	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]]);
@@ -2984,14 +2968,14 @@ void ReplicationChecks(struct CtdlMessage *msg) {
 	if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
 
 	syslog(LOG_DEBUG, "Performing replication checks in <%s>\n",
-		CC->room.QRname);
+	       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;
 	/*syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
-		msg->cm_fields['E'], CC->room.QRname);*/
+	  msg->cm_fields['E'], CC->room.QRname);*/
 
 	old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CC->room);
 	if (old_msgnum > 0L) {
@@ -3009,7 +2993,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 		   struct recptypes *recps,	/* recipients (if mail) */
 		   const char *force,		/* force a particular room? */
 		   int flags			/* should the message be exported clean? */
-) {
+	)
+{
 	char submit_filename[128];
 	char generated_timestamp[32];
 	char hold_rm[ROOMNAMELEN];
@@ -3166,7 +3151,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	smi.meta_msgnum = newmsgid;
 	smi.meta_refcount = 0;
 	safestrncpy(smi.meta_content_type, content_type,
-			sizeof smi.meta_content_type);
+		    sizeof smi.meta_content_type);
 
 	/*
 	 * Measure how big this message will be when rendered as RFC822.
@@ -3211,12 +3196,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 
 	/* If other rooms are specified, drop them there too. */
 	if ((recps != NULL) && (recps->num_room > 0))
-	  for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
-		extract_token(recipient, recps->recp_room, i,
-					'|', sizeof recipient);
-		syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient);
-		CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
-	}
+		for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
+			extract_token(recipient, recps->recp_room, i,
+				      '|', sizeof recipient);
+			syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient);
+			CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
+		}
 
 	/* Bump this user's messages posted counter. */
 	syslog(LOG_DEBUG, "Updating user\n");
@@ -3239,49 +3224,47 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	 * recipient's mailbox and bump the reference count.
 	 */
 	if ((recps != NULL) && (recps->num_local > 0))
-	  for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
-		extract_token(recipient, recps->recp_local, i,
-					'|', sizeof recipient);
-		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
-			msg->cm_fields['W'] = strdup(recipient);
-			CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
-			CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
-			CtdlBumpNewMailCounter(userbuf.usernum);
-			if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) {
-			/* 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\n",
-			SPOOLMIME, newmsgid, (long)time(NULL),
-			bounce_to
-			);
-
-			   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, 0);
-			   CtdlFreeMessage(imsg);
+		for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
+			extract_token(recipient, recps->recp_local, i,
+				      '|', sizeof recipient);
+			syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n",
+			       recipient);
+			if (CtdlGetUser(&userbuf, recipient) == 0) {
+				CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
+				CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
+				CtdlBumpNewMailCounter(userbuf.usernum);
+				if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) {
+					/* 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\n",
+						 SPOOLMIME, newmsgid, (long)time(NULL),
+						 bounce_to
+						);
+				
+					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['2'] = strdup(recipient);
+					CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM, 0);
+					CtdlFreeMessage(imsg);
+				}
+			}
+			else {
+				syslog(LOG_DEBUG, "No user <%s>\n", recipient);
+				CtdlSaveMsgPointerInRoom(config.c_aideroom,
+							 newmsgid, 0, msg);
 			}
 		}
-		else {
-			syslog(LOG_DEBUG, "No user <%s>\n", recipient);
-			CtdlSaveMsgPointerInRoom(config.c_aideroom,
-				newmsgid, 0, msg);
-		}
-	}
 
 	/* Perform "after save" hooks */
 	syslog(LOG_DEBUG, "Performing after-save hooks\n");
@@ -3296,36 +3279,40 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	 * a network spool receiver that can handle the new style messages.
 	 */
 	if ((recps != NULL) && (recps->num_ignet > 0))
-	  for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
-		extract_token(recipient, recps->recp_ignet, i,
-				'|', sizeof recipient);
-
-		hold_R = msg->cm_fields['R'];
-		hold_D = msg->cm_fields['D'];
-		msg->cm_fields['R'] = malloc(SIZ);
-		msg->cm_fields['D'] = malloc(128);
-		extract_token(msg->cm_fields['R'], recipient, 0, '@', SIZ);
-		extract_token(msg->cm_fields['D'], recipient, 1, '@', 128);
+		for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
+			extract_token(recipient, recps->recp_ignet, i,
+				      '|', sizeof recipient);
+
+			hold_R = msg->cm_fields['R'];
+			hold_D = msg->cm_fields['D'];
+			msg->cm_fields['R'] = malloc(SIZ);
+			msg->cm_fields['D'] = malloc(128);
+			extract_token(msg->cm_fields['R'], recipient, 0, '@', SIZ);
+			extract_token(msg->cm_fields['D'], recipient, 1, '@', 128);
 		
-		serialize_message(&smr, msg);
-		if (smr.len > 0) {
-			snprintf(submit_filename, sizeof submit_filename,
+			serialize_message(&smr, msg);
+			if (smr.len > 0) {
+				snprintf(submit_filename, sizeof submit_filename,
 					 "%s/netmail.%04lx.%04x.%04x",
 					 ctdl_netin_dir,
 					 (long) getpid(), CCC->cs_pid, ++seqnum);
-			network_fp = fopen(submit_filename, "wb+");
-			if (network_fp != NULL) {
-				rv = fwrite(smr.ser, smr.len, 1, network_fp);
-				fclose(network_fp);
+				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);
 			}
-			free(smr.ser);
-		}
 
-		free(msg->cm_fields['R']);
-		free(msg->cm_fields['D']);
-		msg->cm_fields['R'] = hold_R;
-		msg->cm_fields['D'] = hold_D;
-	}
+			free(msg->cm_fields['R']);
+			free(msg->cm_fields['D']);
+			msg->cm_fields['R'] = hold_R;
+			msg->cm_fields['D'] = hold_D;
+		}
 
 	/* Go back to the room we started from */
 	syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm);
@@ -3342,11 +3329,11 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 		instr_alloc = 1024;
 		instr = malloc(instr_alloc);
 		snprintf(instr, instr_alloc,
-			"Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
-			"bounceto|%s\n",
-			SPOOLMIME, newmsgid, (long)time(NULL),
-			bounce_to
-		);
+			 "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+			 "bounceto|%s\n",
+			 SPOOLMIME, newmsgid, (long)time(NULL),
+			 bounce_to
+			);
 
 		if (recps->envelope_from != NULL) {
 			tmp = strlen(instr);
@@ -3386,7 +3373,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 		aptr = (struct addresses_to_be_filed *)
 			malloc(sizeof(struct addresses_to_be_filed));
 		CtdlMailboxName(actual_rm, sizeof actual_rm,
-			&CCC->user, USERCONTACTSROOM);
+				&CCC->user, USERCONTACTSROOM);
 		aptr->roomname = strdup(actual_rm);
 		aptr->collected_addresses = collected_addresses;
 		begin_critical_section(S_ATBF);
@@ -3443,7 +3430,7 @@ void aide_message (char *text, char *subject)
  * Convenience function for generating small administrative messages.
  */
 void quickie_message(const char *from, const char *fromaddr, char *to, char *room, const char *text, 
-			int format_type, const char *subject)
+		     int format_type, const char *subject)
 {
 	struct CtdlMessage *msg;
 	struct recptypes *recp = NULL;
@@ -3496,7 +3483,7 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator,	/* token signalling EOT */
 							   exist is ALWAYS freed  */
 			       int crlf,		/* CRLF newlines instead of LF */
 			       int *sock		/* socket handle or 0 for this session's client socket */
-			) 
+	) 
 {
 	StrBuf *Message;
 	StrBuf *LineBuf;
@@ -3772,7 +3759,7 @@ struct CtdlMessage *CtdlMakeMessage(
 	char *supplied_euid,		/* ...or NULL if this is irrelevant */
 	char *preformatted_text,	/* ...or NULL to read text from client */
 	char *references		/* Thread references */
-) {
+	) {
 	char dest_node[256];
 	char buf[1024];
 	struct CtdlMessage *msg;
@@ -3869,10 +3856,10 @@ struct CtdlMessage *CtdlMakeMessage(
 		msg->cm_fields['E'] = strdup(supplied_euid);
 	}
 
-	if (references != NULL) {
-		if (!IsEmptyStr(references)) {
-			msg->cm_fields['W'] = strdup(references);
-		}
+	if ((references != NULL) && (!IsEmptyStr(references))) {
+		if (msg->cm_fields['W'] != NULL)
+			free(msg->cm_fields['W']);
+		msg->cm_fields['W'] = strdup(references);
 	}
 
 	if (preformatted_text != NULL) {
@@ -3885,6 +3872,10 @@ struct CtdlMessage *CtdlMakeMessage(
 	return(msg);
 }
 
+extern int netconfig_check_roomaccess(
+	char *errmsgbuf, 
+	size_t n,
+	const char* RemoteIdentifier); /* TODO: find a smarter way */
 
 /*
  * Check to see whether we have permission to post a message in the current
@@ -3897,7 +3888,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(
 	const char* RemoteIdentifier,
 	int PostPublic,
 	int is_reply
-) {
+	) {
 	int ra;
 
 	if (!(CC->logged_in) && 
@@ -3919,36 +3910,8 @@ int CtdlDoIHavePermissionToPostInThisRoom(
 			return (ERROR + NOT_LOGGED_IN);
 		}
 		if ((PostPublic!=POST_LMTP) &&(CC->room.QRflags2 & QR2_SMTP_PUBLIC) == 0) {
-			SpoolControl *sc;
-			char filename[SIZ];
-			int found;
-
-			if (RemoteIdentifier == NULL)
-			{
-				snprintf(errmsgbuf, n, "Need sender to permit access.");
-				return (ERROR + USERNAME_REQUIRED);
-			}
 
-			assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-			begin_critical_section(S_NETCONFIGS);
-			if (!read_spoolcontrol_file(&sc, filename))
-			{
-				end_critical_section(S_NETCONFIGS);
-				snprintf(errmsgbuf, n,
-					"This mailing list only accepts posts from subscribers.");
-				return (ERROR + NO_SUCH_USER);
-			}
-			end_critical_section(S_NETCONFIGS);
-			found = is_recipient (sc, RemoteIdentifier);
-			free_spoolcontrol_struct(&sc);
-			if (found) {
-				return (0);
-			}
-			else {
-				snprintf(errmsgbuf, n,
-					"This mailing list only accepts posts from subscribers.");
-				return (ERROR + NO_SUCH_USER);
-			}
+			return netconfig_check_roomaccess(errmsgbuf, n, RemoteIdentifier);
 		}
 		return (0);
 
@@ -3956,30 +3919,36 @@ int CtdlDoIHavePermissionToPostInThisRoom(
 
 	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)) && (ra & UA_REPLYALLOWED) && (!is_reply) ) {
+	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.
 		 */
-		snprintf(errmsgbuf, n, "You may only reply to existing messages here.");
-		return (ERROR + HIGHER_ACCESS_REQUIRED);
+		strcpy(errmsgbuf, "OK to reply here");
+		return(0);
 	}
 
-	else if (!(ra & UA_POSTALLOWED)) {
-		snprintf(errmsgbuf, n, "Higher access is required to post in this room.");
+	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);
+
 }
 
 
@@ -4116,98 +4085,98 @@ struct recptypes *validate_recipients(const char *supplied_recipients,
 		invalid = 0;
 		errmsg[0] = 0;
 		switch(mailtype) {
-			case MES_LOCAL:
-				if (!strcasecmp(this_recp, "sysop")) {
-					++ret->num_room;
-					strcpy(this_recp, config.c_aideroom);
-					if (!IsEmptyStr(ret->recp_room)) {
-						strcat(ret->recp_room, "|");
-					}
-					strcat(ret->recp_room, this_recp);
+		case MES_LOCAL:
+			if (!strcasecmp(this_recp, "sysop")) {
+				++ret->num_room;
+				strcpy(this_recp, config.c_aideroom);
+				if (!IsEmptyStr(ret->recp_room)) {
+					strcat(ret->recp_room, "|");
 				}
-				else if ( (!strncasecmp(this_recp, "room_", 5))
-				      && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
+				strcat(ret->recp_room, this_recp);
+			}
+			else if ( (!strncasecmp(this_recp, "room_", 5))
+				  && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
 
-				      	/* Save room so we can restore it later */
-					tempQR2 = CC->room;
-					CC->room = tempQR;
+				/* Save room so we can restore it later */
+				tempQR2 = CC->room;
+				CC->room = tempQR;
 					
-					/* Check permissions to send mail to this room */
-					err = CtdlDoIHavePermissionToPostInThisRoom(
-						errmsg, 
-						sizeof errmsg, 
-						RemoteIdentifier,
-						Flags,
-						0			/* 0 = not a reply */
+				/* Check permissions to send mail to this room */
+				err = CtdlDoIHavePermissionToPostInThisRoom(
+					errmsg, 
+					sizeof errmsg, 
+					RemoteIdentifier,
+					Flags,
+					0			/* 0 = not a reply */
 					);
-					if (err)
-					{
-						++ret->num_error;
-						invalid = 1;
-					} 
-					else {
-						++ret->num_room;
-						if (!IsEmptyStr(ret->recp_room)) {
-							strcat(ret->recp_room, "|");
-						}
-						strcat(ret->recp_room, &this_recp_cooked[5]);
-					}
-					
-					/* Restore room in case something needs it */
-					CC->room = tempQR2;
-
-				}
-				else if (CtdlGetUser(&tempUS, this_recp) == 0) {
-					++ret->num_local;
-					strcpy(this_recp, tempUS.fullname);
-					if (!IsEmptyStr(ret->recp_local)) {
-						strcat(ret->recp_local, "|");
-					}
-					strcat(ret->recp_local, this_recp);
-				}
-				else if (CtdlGetUser(&tempUS, this_recp_cooked) == 0) {
-					++ret->num_local;
-					strcpy(this_recp, tempUS.fullname);
-					if (!IsEmptyStr(ret->recp_local)) {
-						strcat(ret->recp_local, "|");
-					}
-					strcat(ret->recp_local, this_recp);
-				}
-				else {
-					++ret->num_error;
-					invalid = 1;
-				}
-				break;
-			case MES_INTERNET:
-				/* Yes, you're reading this correctly: if the target
-				 * domain points back to the local system or an attached
-				 * Citadel directory, the address is invalid.  That's
-				 * because if the address were valid, we would have
-				 * already translated it to a local address by now.
-				 */
-				if (IsDirectory(this_recp, 0)) {
+				if (err)
+				{
 					++ret->num_error;
 					invalid = 1;
-				}
+				} 
 				else {
-					++ret->num_internet;
-					if (!IsEmptyStr(ret->recp_internet)) {
-						strcat(ret->recp_internet, "|");
+					++ret->num_room;
+					if (!IsEmptyStr(ret->recp_room)) {
+						strcat(ret->recp_room, "|");
 					}
-					strcat(ret->recp_internet, this_recp);
+					strcat(ret->recp_room, &this_recp_cooked[5]);
 				}
-				break;
-			case MES_IGNET:
-				++ret->num_ignet;
-				if (!IsEmptyStr(ret->recp_ignet)) {
-					strcat(ret->recp_ignet, "|");
+					
+				/* Restore room in case something needs it */
+				CC->room = tempQR2;
+
+			}
+			else if (CtdlGetUser(&tempUS, this_recp) == 0) {
+				++ret->num_local;
+				strcpy(this_recp, tempUS.fullname);
+				if (!IsEmptyStr(ret->recp_local)) {
+					strcat(ret->recp_local, "|");
 				}
-				strcat(ret->recp_ignet, this_recp);
-				break;
-			case MES_ERROR:
+				strcat(ret->recp_local, this_recp);
+			}
+			else if (CtdlGetUser(&tempUS, this_recp_cooked) == 0) {
+				++ret->num_local;
+				strcpy(this_recp, tempUS.fullname);
+				if (!IsEmptyStr(ret->recp_local)) {
+					strcat(ret->recp_local, "|");
+				}
+				strcat(ret->recp_local, this_recp);
+			}
+			else {
 				++ret->num_error;
 				invalid = 1;
-				break;
+			}
+			break;
+		case MES_INTERNET:
+			/* Yes, you're reading this correctly: if the target
+			 * domain points back to the local system or an attached
+			 * Citadel directory, the address is invalid.  That's
+			 * because if the address were valid, we would have
+			 * already translated it to a local address by now.
+			 */
+			if (IsDirectory(this_recp, 0)) {
+				++ret->num_error;
+				invalid = 1;
+			}
+			else {
+				++ret->num_internet;
+				if (!IsEmptyStr(ret->recp_internet)) {
+					strcat(ret->recp_internet, "|");
+				}
+				strcat(ret->recp_internet, this_recp);
+			}
+			break;
+		case MES_IGNET:
+			++ret->num_ignet;
+			if (!IsEmptyStr(ret->recp_ignet)) {
+				strcat(ret->recp_ignet, "|");
+			}
+			strcat(ret->recp_ignet, this_recp);
+			break;
+		case MES_ERROR:
+			++ret->num_error;
+			invalid = 1;
+			break;
 		}
 		if (invalid) {
 			if (IsEmptyStr(errmsg)) {
@@ -4237,7 +4206,7 @@ struct recptypes *validate_recipients(const char *supplied_recipients,
 	}
 
 	if ((ret->num_local + ret->num_internet + ret->num_ignet +
-	   ret->num_room + ret->num_error) == 0) {
+	     ret->num_room + ret->num_error) == 0) {
 		ret->num_error = (-1);
 		strcpy(ret->errormsg, "No recipients specified.");
 	}
@@ -4286,6 +4255,7 @@ void free_recipients(struct recptypes *valid) {
  */
 void cmd_ent0(char *entargs)
 {
+	struct CitContext *CCC = CC;
 	int post = 0;
 	char recp[SIZ];
 	char cc[SIZ];
@@ -4306,6 +4276,7 @@ void cmd_ent0(char *entargs)
 	char subject[SIZ];
 	int subject_required = 0;
 	int do_confirm = 0;
+	int verbose_reply = 0;
 	long msgnum;
 	int i, j;
 	char buf[256];
@@ -4324,14 +4295,15 @@ void cmd_ent0(char *entargs)
 	do_confirm = extract_int(entargs, 6);
 	extract_token(cc, entargs, 7, '|', sizeof cc);
 	extract_token(bcc, entargs, 8, '|', sizeof bcc);
+	verbose_reply = extract_int(entargs, 9);
 	switch(CC->room.QRdefaultview) {
-		case VIEW_NOTES:
-		case VIEW_WIKI:
-			extract_token(supplied_euid, entargs, 9, '|', sizeof supplied_euid);
-			break;
-		default:
-			supplied_euid[0] = 0;
-			break;
+	case VIEW_NOTES:
+	case VIEW_WIKI:
+		extract_token(supplied_euid, entargs, 9, '|', sizeof supplied_euid);
+		break;
+	default:
+		supplied_euid[0] = 0;
+		break;
 	}
 	extract_token(newuseremail, entargs, 10, '|', sizeof newuseremail);
 	extract_token(references, entargs, 11, '|', sizeof references);
@@ -4347,7 +4319,7 @@ void cmd_ent0(char *entargs)
 		NULL,
 		POST_LOGGED_IN,
 		(!IsEmptyStr(references))		/* is this a reply?  or a top-level post? */
-	);
+		);
 	if (err)
 	{
 		cprintf("%d %s\n", err, errmsg);
@@ -4357,16 +4329,16 @@ void cmd_ent0(char *entargs)
 	/* Check some other permission type things. */
 
 	if (IsEmptyStr(newusername)) {
-		strcpy(newusername, CC->user.fullname);
+		strcpy(newusername, CCC->user.fullname);
 	}
-	if (  (CC->user.axlevel < AxAideU)
-	   && (strcasecmp(newusername, CC->user.fullname))
-	   && (strcasecmp(newusername, CC->cs_inet_fn))
-	) {	
+	if (  (CCC->user.axlevel < AxAideU)
+	      && (strcasecmp(newusername, CCC->user.fullname))
+	      && (strcasecmp(newusername, CCC->cs_inet_fn))
+		) {	
 		cprintf("%d You don't have permission to author messages as '%s'.\n",
 			ERROR + HIGHER_ACCESS_REQUIRED,
 			newusername
-		);
+			);
 		return;
 	}
 
@@ -4376,13 +4348,13 @@ void cmd_ent0(char *entargs)
 	}
 
 	if (!IsEmptyStr(newuseremail)) {
-		if (!strcasecmp(newuseremail, CC->cs_inet_email)) {
+		if (!strcasecmp(newuseremail, CCC->cs_inet_email)) {
 			newuseremail_ok = 1;
 		}
-		else if (!IsEmptyStr(CC->cs_inet_other_emails)) {
-			j = num_tokens(CC->cs_inet_other_emails, '|');
+		else if (!IsEmptyStr(CCC->cs_inet_other_emails)) {
+			j = num_tokens(CCC->cs_inet_other_emails, '|');
 			for (i=0; i<j; ++i) {
-				extract_token(buf, CC->cs_inet_other_emails, i, '|', sizeof buf);
+				extract_token(buf, CCC->cs_inet_other_emails, i, '|', sizeof buf);
 				if (!strcasecmp(newuseremail, buf)) {
 					newuseremail_ok = 1;
 				}
@@ -4394,11 +4366,11 @@ void cmd_ent0(char *entargs)
 		cprintf("%d You don't have permission to author messages as '%s'.\n",
 			ERROR + HIGHER_ACCESS_REQUIRED,
 			newuseremail
-		);
+			);
 		return;
 	}
 
-	CC->cs_flags |= CS_POSTING;
+	CCC->cs_flags |= CS_POSTING;
 
 	/* In mailbox rooms we have to behave a little differently --
 	 * make sure the user has specified at least one recipient.  Then
@@ -4407,10 +4379,10 @@ void cmd_ent0(char *entargs)
 	 * 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) )
-	) && (strcasecmp(&CC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
-		if (CC->user.axlevel < AxProbU) {
+	if ( (  ( (CCC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CCC->room.QRname[11], MAILROOM)) )
+		|| ( (CCC->room.QRflags & QR_MAILBOX) && (CCC->curr_view == VIEW_MAILBOX) )
+		     ) && (strcasecmp(&CCC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
+		if (CCC->user.axlevel < AxProbU) {
 			strcpy(recp, "sysop");
 			strcpy(cc, "");
 			strcpy(bcc, "");
@@ -4450,7 +4422,7 @@ void cmd_ent0(char *entargs)
 		}
 
 		if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) {
-			if (CtdlCheckInternetMailPermission(&CC->user)==0) {
+			if (CtdlCheckInternetMailPermission(&CCC->user)==0) {
 				cprintf("%d You do not have permission "
 					"to send Internet mail.\n",
 					ERROR + HIGHER_ACCESS_REQUIRED);
@@ -4462,7 +4434,7 @@ void cmd_ent0(char *entargs)
 		}
 
 		if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
-		   && (CC->user.axlevel < AxNetU) ) {
+		     && (CCC->user.axlevel < AxNetU) ) {
 			cprintf("%d Higher access required for network mail.\n",
 				ERROR + HIGHER_ACCESS_REQUIRED);
 			free_recipients(valid_to);
@@ -4473,8 +4445,8 @@ void cmd_ent0(char *entargs)
 	
 		if ((RESTRICT_INTERNET == 1)
 		    && (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0)
-		    && ((CC->user.flags & US_INTERNET) == 0)
-		    && (!CC->internal_pgm)) {
+		    && ((CCC->user.flags & US_INTERNET) == 0)
+		    && (!CCC->internal_pgm)) {
 			cprintf("%d You don't have access to Internet mail.\n",
 				ERROR + HIGHER_ACCESS_REQUIRED);
 			free_recipients(valid_to);
@@ -4487,16 +4459,16 @@ void cmd_ent0(char *entargs)
 
 	/* Is this a room which has anonymous-only or anonymous-option? */
 	anonymous = MES_NORMAL;
-	if (CC->room.QRflags & QR_ANONONLY) {
+	if (CCC->room.QRflags & QR_ANONONLY) {
 		anonymous = MES_ANONONLY;
 	}
-	if (CC->room.QRflags & QR_ANONOPT) {
+	if (CCC->room.QRflags & QR_ANONOPT) {
 		if (anon_flag == 1) {	/* only if the user requested it */
 			anonymous = MES_ANONOPT;
 		}
 	}
 
-	if ((CC->room.QRflags & QR_MAILBOX) == 0) {
+	if ((CCC->room.QRflags & QR_MAILBOX) == 0) {
 		recp[0] = 0;
 	}
 
@@ -4504,7 +4476,7 @@ void cmd_ent0(char *entargs)
 	 * 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 (CCC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
 	if ((valid_to)	&& (valid_to->num_internet > 0))	subject_required = 1;
 	if ((valid_cc)	&& (valid_cc->num_internet > 0))	subject_required = 1;
 	if ((valid_bcc)	&& (valid_bcc->num_internet > 0))	subject_required = 1;
@@ -4534,11 +4506,11 @@ void cmd_ent0(char *entargs)
 		cprintf("%d send message\n", SEND_LISTING);
 	}
 
-	msg = CtdlMakeMessage(&CC->user, recp, cc,
-		CC->room.QRname, anonymous, format_type,
-		newusername, newuseremail, subject,
-		((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL),
-		NULL, references);
+	msg = CtdlMakeMessage(&CCC->user, recp, cc,
+			      CCC->room.QRname, anonymous, format_type,
+			      newusername, newuseremail, subject,
+			      ((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL),
+			      NULL, references);
 
 	/* Put together one big recipients struct containing to/cc/bcc all in
 	 * one.  This is for the envelope.
@@ -4567,14 +4539,24 @@ void cmd_ent0(char *entargs)
 
 	if (msg != NULL) {
 		msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR);
+		if (verbose_reply)
+		{
+			if (StrLength(CCC->StatusMessage)>0)
+			{
+				StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n000\n"), 0);
+				cputbuf(CCC->StatusMessage);
+			}
+			else
+				client_write(HKEY("\n000\n"));
+		}
 
 		if (do_confirm) {
 			cprintf("%ld\n", msgnum);
 			if (msgnum >= 0L) {
-				cprintf("Message accepted.\n");
+				client_write(HKEY("Message accepted.\n"));
 			}
 			else {
-				cprintf("Internal error.\n");
+				client_write(HKEY("Internal error.\n"));
 			}
 			if (msg->cm_fields['E'] != NULL) {
 				cprintf("%s\n", msg->cm_fields['E']);
@@ -4599,10 +4581,10 @@ void cmd_ent0(char *entargs)
  * (returns the actual number of messages deleted)
  */
 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.  regular expressions expected. */
-)
+		       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.  regular expressions expected. */
+	)
 {
 	struct ctdlroom qrbuf;
 	struct cdbdata *cdbfr;
@@ -4618,16 +4600,16 @@ int CtdlDeleteMessages(char *room_name,		/* which room */
 	int need_to_free_re = 0;
 
 	if (content_type) if (!IsEmptyStr(content_type)) {
-		regcomp(&re, content_type, 0);
-		need_to_free_re = 1;
-	}
+			regcomp(&re, content_type, 0);
+			need_to_free_re = 1;
+		}
 	syslog(LOG_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n",
-		room_name, num_dmsgnums, content_type);
+	       room_name, num_dmsgnums, content_type);
 
 	/* get room record, obtaining a lock... */
 	if (CtdlGetRoomLock(&qrbuf, room_name) != 0) {
 		syslog(LOG_ERR, "CtdlDeleteMessages(): Room <%s> not found\n",
-			room_name);
+		       room_name);
 		if (need_to_free_re) regfree(&re);
 		return (0);	/* room not found */
 	}
@@ -4696,9 +4678,9 @@ int CtdlDeleteMessages(char *room_name,		/* which room */
 	 * section.
 	 */
 	if (num_deleted) for (i=0; i<num_deleted; ++i) {
-		PerformDeleteHooks(qrbuf.QRname, dellist[i]);
-		AdjRefCount(dellist[i], -1);
-	}
+			PerformDeleteHooks(qrbuf.QRname, dellist[i]);
+			AdjRefCount(dellist[i], -1);
+		}
 
 	/* Now free the memory we used, and go away. */
 	if (msglist != NULL) free(msglist);
@@ -4828,12 +4810,12 @@ void cmd_move(char *args)
 
 	/* Permit move/copy from personal rooms */
 	if ((CC->room.QRflags & QR_MAILBOX)
-	   && (qtemp.QRflags & QR_MAILBOX)) permit = 1;
+	    && (qtemp.QRflags & QR_MAILBOX)) permit = 1;
 
 	/* Permit only copy from public to personal room */
 	if ( (is_copy)
-	   && (!(CC->room.QRflags & QR_MAILBOX))
-	   && (qtemp.QRflags & QR_MAILBOX)) permit = 1;
+	     && (!(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;
@@ -4938,8 +4920,8 @@ void AdjRefCount(long msgnum, int incr)
 	int rv = 0;
 
 	syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n",
-		msgnum, incr
-	);
+	       msgnum, incr
+		);
 
 	begin_critical_section(S_SUPPMSGMAIN);
 	if (arcfp == NULL) {
@@ -4970,6 +4952,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;
@@ -5055,8 +5042,8 @@ void TDAP_AdjRefCount(long msgnum, int incr)
 	PutMetaData(&smi);
 	end_critical_section(S_SUPPMSGMAIN);
 	syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n",
-		msgnum, incr, smi.meta_refcount
-	);
+	       msgnum, incr, smi.meta_refcount
+		);
 
 	/* If the reference count is now zero, delete the message
 	 * (and its supplementary record as well).
@@ -5086,14 +5073,14 @@ void TDAP_AdjRefCount(long msgnum, int incr)
  * files, and still pull the message into memory as with all others.
  */
 void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
-			char *content_type,		/* MIME type of this object */
-			char *raw_message,		/* Data to be written */
-			off_t raw_length,		/* Size of raw_message */
-			struct ctdluser *is_mailbox,	/* Mailbox room? */
-			int is_binary,			/* Is encoding necessary? */
-			int is_unique,			/* Del others of this type? */
-			unsigned int flags		/* Internal save flags */
-			)
+		     char *content_type,		/* MIME type of this object */
+		     char *raw_message,		/* Data to be written */
+		     off_t raw_length,		/* Size of raw_message */
+		     struct ctdluser *is_mailbox,	/* Mailbox room? */
+		     int is_binary,			/* Is encoding necessary? */
+		     int is_unique,			/* Del others of this type? */
+		     unsigned int flags		/* Internal save flags */
+	)
 {
 
 	struct ctdlroom qrbuf;
@@ -5122,12 +5109,12 @@ void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
 	if (is_binary) {
 		sprintf(&encoded_message[strlen(encoded_message)],
 			"Content-transfer-encoding: base64\n\n"
-		);
+			);
 	}
 	else {
 		sprintf(&encoded_message[strlen(encoded_message)],
 			"Content-transfer-encoding: 7bit\n\n"
-		);
+			);
 	}
 
 	if (is_binary) {
@@ -5136,14 +5123,14 @@ void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
 			raw_message,
 			(int)raw_length,
 			0
-		);
+			);
 	}
 	else {
 		memcpy(
 			&encoded_message[strlen(encoded_message)],
 			raw_message,
 			(int)(raw_length+1)
-		);
+			);
 	}
 
 	syslog(LOG_DEBUG, "Allocating\n");
@@ -5163,16 +5150,16 @@ void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
 	/* Create the requested room if we have to. */
 	if (CtdlGetRoom(&qrbuf, roomname) != 0) {
 		CtdlCreateRoom(roomname, 
-			( (is_mailbox != NULL) ? 5 : 3 ),
-			"", 0, 1, 0, VIEW_BBS);
+			       ( (is_mailbox != NULL) ? 5 : 3 ),
+			       "", 0, 1, 0, VIEW_BBS);
 	}
 	/* If the caller specified this object as unique, delete all
 	 * other objects of this type that are currently in the room.
 	 */
 	if (is_unique) {
 		syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n",
-			CtdlDeleteMessages(roomname, NULL, 0, content_type)
-		);
+		       CtdlDeleteMessages(roomname, NULL, 0, content_type)
+			);
 	}
 	/* Now write the data */
 	CtdlSubmitMsg(msg, NULL, roomname, 0);
@@ -5207,7 +5194,7 @@ char *CtdlGetSysConfig(char *sysconfname) {
 	begin_critical_section(S_CONFIG);
 	config_msgnum = (-1L);
 	CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL,
-		CtdlGetSysConfigBackend, NULL);
+			   CtdlGetSysConfigBackend, NULL);
 	msgnum = config_msgnum;
 	end_critical_section(S_CONFIG);
 
@@ -5228,9 +5215,9 @@ char *CtdlGetSysConfig(char *sysconfname) {
 	CtdlGetRoom(&CC->room, hold_rm);
 
 	if (conf != NULL) do {
-		extract_token(buf, conf, 0, '\n', sizeof buf);
-		strcpy(conf, &conf[strlen(buf)+1]);
-	} while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) );
+			extract_token(buf, conf, 0, '\n', sizeof buf);
+			strcpy(conf, &conf[strlen(buf)+1]);
+		} while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) );
 
 	return(conf);
 }