From 99f5a2324115920e21e153e77ef369dc053299c7 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Fri, 13 Apr 2012 12:06:00 -0400
Subject: [PATCH] Revert "SMTP-Client: make shure everything is finished before
 we terminate one client."

This reverts commit 91a9b8806b53105a54a4bc83bb40d68b5d6f0b6d.
---
 citadel/modules/smtp/serv_smtpeventclient.c | 19 +------------------
 citadel/modules/smtp/serv_smtpqueue.c       | 17 -----------------
 citadel/modules/smtp/smtpqueue.h            |  3 ---
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index c8da5590e..e5c1cee00 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -126,7 +126,6 @@ eNextState FinalizeMessageSendDB(AsyncIO *IO);
 eNextState FinalizeMessageSend_DB1(AsyncIO *IO);
 eNextState FinalizeMessageSend_DB2(AsyncIO *IO);
 eNextState FinalizeMessageSend_DB3(AsyncIO *IO);
-eNextState FinalizeMessageSend_DB4(AsyncIO *IO);
 
 /******************************************************************************
  * So, we're finished with sending (regardless of success or failure)         *
@@ -218,27 +217,11 @@ inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
 				   "");
 		FreeStrBuf(&Msg->QMsgData);
 	}
-	DecreaseShutdownDeliveries(Msg->MyQItem);
 }
 eNextState FinalizeMessageSend_DB3(AsyncIO *IO)
 {
-	SmtpOutMsg *Msg = IO->Data;
 	FinalizeMessageSend_DB_3(IO);
-	if (!Msg->IDestructQueItem)
-		return eAbort;
-	return NextDBOperation(IO, FinalizeMessageSend_DB4);
-}
-
-eNextState FinalizeMessageSend_DB4(AsyncIO *IO)
-{
-	int n;
-	SmtpOutMsg *Msg = IO->Data;
-
-	n = GetShutdownDeliveries(Msg->MyQItem);
-	if (n > 0) 
-		return NextDBOperation(IO, FinalizeMessageSend_DB4);
-	else
-		return eAbort;
+	return eAbort;
 }
 
 eNextState FinalizeMessageSend_DB(AsyncIO *IO)
diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 92bc9d625..2292df1c4 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -141,22 +141,6 @@ int DecreaseQReference(OneQueItem *MyQItem)
 	return IDestructQueItem;
 }
 
-void DecreaseShutdownDeliveries(OneQueItem *MyQItem)
-{
-	pthread_mutex_lock(&ActiveQItemsLock);
-	MyQItem->NotYetShutdownDeliveries--;
-	pthread_mutex_unlock(&ActiveQItemsLock);
-}
-
-int GetShutdownDeliveries(OneQueItem *MyQItem)
-{
-	int DestructNow;
-
-	pthread_mutex_lock(&ActiveQItemsLock);
-	DestructNow = MyQItem->ActiveDeliveries == 0;
-	pthread_mutex_unlock(&ActiveQItemsLock);
-	return DestructNow;
-}
 void RemoveQItem(OneQueItem *MyQItem)
 {
 	long len;
@@ -872,7 +856,6 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	}
 	DeleteHashPos(&It);
 
-	MyQItem->NotYetShutdownDeliveries = 
 	MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem);
 
 	/* failsafe against overload: 
diff --git a/citadel/modules/smtp/smtpqueue.h b/citadel/modules/smtp/smtpqueue.h
index c6cd97f58..6c6dc5311 100644
--- a/citadel/modules/smtp/smtpqueue.h
+++ b/citadel/modules/smtp/smtpqueue.h
@@ -56,7 +56,6 @@ typedef struct queueitem {
 	time_t Retry;
 
 	long ActiveDeliveries;
-	long NotYetShutdownDeliveries;
 	StrBuf *EnvelopeFrom;
 	StrBuf *BounceTo;
 	StrBuf *SenderRoom;
@@ -71,8 +70,6 @@ typedef struct __QItemHandlerStruct {
 	QItemHandler H;
 } QItemHandlerStruct;
 int     DecreaseQReference(OneQueItem *MyQItem);
-void DecreaseShutdownDeliveries(OneQueItem *MyQItem);
-int GetShutdownDeliveries(OneQueItem *MyQItem);
 void    RemoveQItem(OneQueItem *MyQItem);
 int     CountActiveQueueEntries(OneQueItem *MyQItem);
 StrBuf *SerializeQueueItem(OneQueItem *MyQItem);
-- 
2.30.2