Revert "SMTP-Client: make shure everything is finished before we terminate one client."

[citadel.git] / citadel / modules / smtp / serv_smtpqueue.c

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 92bc9d625d0826398c0dab5636f7395f3cfa37d8..2292df1c46eb7582808528d7919dc8da929875e3 100644 (file)
--- 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: