*
* This is the new, exciting, clever version that makes libcurl do all the work :)
*
- * Copyright (c) 1997-2018 by the citadel.org team
+ * Copyright (c) 1997-2020 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published
#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>
* not happen because the delivery instructions message does not
* contain a recipient.
*/
-int smtp_aftersave(struct CtdlMessage *msg, recptypes * recps)
+int smtp_aftersave(struct CtdlMessage *msg, struct recptypes *recps)
{
if ((recps != NULL) && (recps->num_internet > 0)) {
struct CtdlMessage *imsg = NULL;
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;
int delete_this_queue = 0;
char server_response[SIZ];
- msg = CtdlFetchMessage(qmsgnum, 1, 1);
+ msg = CtdlFetchMessage(qmsgnum, 1);
if (msg == NULL) {
syslog(LOG_WARNING, "smtpclient: %ld does not exist", qmsgnum);
return;
// 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, "");
}