X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=ddc12aafdba517bfa33030a5873582455138d836;hb=5a307b0a88035de98ff16efc347994c82bdab8a9;hp=4c1bd70ed2bdb2fedc8c1579e5c3a0f313909798;hpb=80172bd70dde62001e0779f39efd4ad9835788d9;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 4c1bd70ed..ddc12aafd 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2870,9 +2870,9 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 
 	/* Bump this user's messages posted counter. */
 	MSGM_syslog(LOG_DEBUG, "Updating user\n");
-	CtdlGetUserLock(&CCC->user, CCC->curr_user);
+	CtdlLockGetCurrentUser();
 	CCC->user.posted = CCC->user.posted + 1;
-	CtdlPutUserLock(&CCC->user);
+	CtdlPutCurrentUserLock();
 
 	/* Decide where bounces need to be delivered */
 	if ((recps != NULL) && (recps->bounce_to == NULL))
@@ -3050,7 +3050,7 @@ void flood_protect_quickie_message(const char *from,
 				   const char *subject,
 				   int nCriterions,
 				   const char **CritStr,
-				   long *CritStrLen,
+				   const long *CritStrLen,
 				   long ccid,
 				   long ioid,
 				   time_t NOW)
@@ -3061,7 +3061,8 @@ void flood_protect_quickie_message(const char *from,
 	StrBuf *guid;
 	char timestamp[64];
 	long tslen;
-	time_t tsday = NOW / (8*60*60); /* just care for a day... */
+	static const time_t tsday = (8*60*60); /* just care for a day... */
+	time_t seenstamp;
 
 	tslen = snprintf(timestamp, sizeof(timestamp), "%ld", tsday);
 	MD5Init(&md5context);
@@ -3080,29 +3081,35 @@ void flood_protect_quickie_message(const char *from,
 	if (StrLength(guid) > 40)
 		StrBufCutAt(guid, 40, NULL);
 
-	if (CheckIfAlreadySeen("FPAideMessage",
-			       guid,
-			       NOW,
-			       tsday,
-			       eUpdate,
-			       ccid,
-			       ioid)!= 0)
+	seenstamp = CheckIfAlreadySeen("FPAideMessage",
+				       guid,
+				       NOW,
+				       tsday,
+				       eUpdate,
+				       ccid,
+				       ioid);
+	if ((seenstamp > 0) && (seenstamp < tsday))
 	{
 		FreeStrBuf(&guid);
 		/* yes, we did. flood protection kicks in. */
 		syslog(LOG_DEBUG,
-		       "not sending message again\n");
+		       "not sending message again - %ld < %ld \n", seenstamp, tsday);
 		return;
 	}
-	FreeStrBuf(&guid);
-	/* no, this message isn't sent recently; go ahead. */
-	quickie_message(from,
-			fromaddr,
-			to,
-			room,
-			text, 
-			format_type,
-			subject);
+	else
+	{
+		syslog(LOG_DEBUG,
+		       "sending message. %ld >= %ld", seenstamp, tsday);
+		FreeStrBuf(&guid);
+		/* no, this message isn't sent recently; go ahead. */
+		quickie_message(from,
+				fromaddr,
+				to,
+				room,
+				text, 
+				format_type,
+				subject);
+	}
 }
 
 
@@ -3257,6 +3264,11 @@ eReadState CtdlReadMessageBodyAsync(AsyncIO *IO)
 		 IO->SendBuf.fd);
 	
 	fd = fopen(fn, "a+");
+	if (fd == NULL) {
+		syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno));
+		cit_backtrace();
+		exit(1);
+	}
 #endif
 
 	ReadMsg = IO->ReadMsg;
@@ -3338,7 +3350,7 @@ eReadState CtdlReadMessageBodyAsync(AsyncIO *IO)
 	if (MsgFinished)
 		return eReadSuccess;
 	else 
-		return eAbort;
+		return eReadFail;
 }