stable now but there are GIANT PIECES MISSING

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

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index 70db0a1161122f5cdbab638fefbe152b48a92352..c81bde42a0f9b18147ec5817d579d0267e35a5a9 100644 (file)
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -20,18 +20,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sysconfig.h>
-
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
 #include <time.h>
-#endif
-#endif
-
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -141,7 +130,7 @@ int smtp_aftersave(struct CtdlMessage *msg, recptypes * recps)
                CM_SetField(imsg, eAuthor, HKEY("Citadel"));
                CM_SetField(imsg, eJournal, HKEY("do not journal"));
                CM_SetAsFieldSB(imsg, eMesageText, &SpoolMsg);
-               CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
+               CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
                CM_Free(imsg);
        }
        return 0;
@@ -499,7 +488,7 @@ void smtp_process_one_msg(long qmsgnum)
                        // replace the old queue entry with the new one
                        syslog(LOG_DEBUG, "smtpclient: %ld rewriting", qmsgnum);
                        msg = convert_internet_message_buf(&NewInstr);  // This function will free NewInstr for us
-                       CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, 0);
+                       CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
                        CM_Free(msg);
                        CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &qmsgnum, 1, "");
                }