-/* $Id$ */
+/*
+ * $Id$
+ *
+ * An implementation of RFC821 (Simple Mail Transfer Protocol) for the
+ * Citadel system.
+ *
+ */
#include "sysdep.h"
#include <stdlib.h>
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.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 <sys/wait.h>
#include <ctype.h>
#include <string.h>
#include <limits.h>
-#include <time.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
struct citsmtp { /* Information about the current session */
int command_state;
- char helo_node[256];
+ char helo_node[SIZ];
struct usersupp vrfy_buffer;
int vrfy_count;
- char vrfy_match[256];
- char from[256];
+ char vrfy_match[SIZ];
+ char from[SIZ];
int number_of_recipients;
int delivery_mode;
int message_originated_locally;
CC->internal_pgm = 1;
CC->cs_flags |= CS_STEALTH;
CtdlAllocUserData(SYM_SMTP, sizeof(struct citsmtp));
- CtdlAllocUserData(SYM_SMTP_RECP, 256);
+ CtdlAllocUserData(SYM_SMTP_RECP, SIZ);
sprintf(SMTP_RECP, "%s", "");
- cprintf("220 Welcome to the Citadel/UX ESMTP server at %s\r\n",
- config.c_fqdn);
+ cprintf("220 %s ESMTP Citadel/UX server ready.\r\n", config.c_fqdn);
}
cprintf("250 Greetings and joyous salutations.\r\n");
}
else {
- cprintf("250-Greetings and joyous salutations.\r\n");
+ cprintf("250-Extended greetings and joyous salutations.\r\n");
cprintf("250-HELP\r\n");
cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
cprintf("250 AUTH=LOGIN\r\n");
* Implement HELP command.
*/
void smtp_help(void) {
- cprintf("214-Here's the frequency, Kenneth:\r\n");
+ cprintf("214-Commands accepted:\r\n");
cprintf("214- DATA\r\n");
cprintf("214- EHLO\r\n");
cprintf("214- EXPN\r\n");
cprintf("214- RCPT\r\n");
cprintf("214- RSET\r\n");
cprintf("214- VRFY\r\n");
- cprintf("214 I could tell you more, but then I'd have to kill you.\r\n");
+ cprintf("214 \r\n");
}
*
*/
void smtp_get_user(char *argbuf) {
- char buf[256];
- char username[256];
+ char buf[SIZ];
+ char username[SIZ];
decode_base64(username, argbuf);
lprintf(9, "Trying <%s>\n", username);
*
*/
void smtp_get_pass(char *argbuf) {
- char password[256];
+ char password[SIZ];
decode_base64(password, argbuf);
lprintf(9, "Trying <%s>\n", password);
*
*/
void smtp_auth(char *argbuf) {
- char buf[256];
+ char buf[SIZ];
if (strncasecmp(argbuf, "login", 5) ) {
cprintf("550 We only support LOGIN authentication.\r\n");
* Implements the "MAIL From:" command
*/
void smtp_mail(char *argbuf) {
- char user[256];
- char node[256];
+ char user[SIZ];
+ char node[SIZ];
int cvt;
if (strlen(SMTP->from) != 0) {
* this system.
*/
else {
+ TRACE;
cvt = convert_internet_address(user, node, SMTP->from);
+ TRACE;
lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
if (CtdlHostAlias(node) == hostalias_localhost) {
+ TRACE;
cprintf("550 You must log in to send mail from %s\r\n",
node);
strcpy(SMTP->from, "");
*/
void smtp_rcpt(char *argbuf) {
int cvt;
- char user[256];
- char node[256];
- char recp[256];
+ char user[SIZ];
+ char node[SIZ];
+ char recp[SIZ];
if (strlen(SMTP->from) == 0) {
cprintf("503 Need MAIL before RCPT\r\n");
case rfc822_address_nonlocal:
if (SMTP->message_originated_locally == 0) {
- cprintf("551 Relaying denied\r\n");
+ cprintf("551 Third-party relaying denied.\r\n");
}
else {
cprintf("250 Remote recipient %s ok\r\n", recp);
struct ser_ret smr;
char *hold_R, *hold_D, *hold_O;
FILE *fp;
- char filename[256];
+ char filename[SIZ];
static int seq = 0;
lprintf(9, "smtp_deliver_ignet(msg, %s, %s)\n", user, dest);
char *body;
struct CtdlMessage *msg;
int retval;
- char nowstamp[256];
+ char nowstamp[SIZ];
if (strlen(SMTP->from) == 0) {
cprintf("503 Need MAIL command first.\r\n");
cprintf("354 Transmit message now; terminate with '.' by itself\r\n");
- generate_rfc822_datestamp(nowstamp, time(NULL));
+ datestring(nowstamp, time(NULL), DATESTRING_RFC822);
body = mallok(4096);
if (body != NULL) snprintf(body, 4096,
CtdlFreeMessage(msg);
if (!retval) {
- cprintf("250 Message accepted for delivery.\r\n");
+ cprintf("250 ok terrific\r\n");
}
else {
cprintf("550 Internal delivery errors: %d\r\n", retval);
* Main command loop for SMTP sessions.
*/
void smtp_command_loop(void) {
- char cmdbuf[256];
+ char cmdbuf[SIZ];
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
}
else {
- cprintf("502 I'm sorry Dave, I'm afraid I can't do that.\r\n");
+ cprintf("502 I'm afraid I can't do that.\r\n");
}
}
int num_mxhosts;
int mx;
int i;
- char user[256], node[256], name[256];
+ char user[SIZ], node[SIZ], name[SIZ];
char buf[1024];
char mailfrom[1024];
int lp, rp;
lprintf(9, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
if (num_mxhosts < 1) {
*status = 5;
- snprintf(dsn, 256, "No MX hosts found for <%s>", node);
+ snprintf(dsn, SIZ, "No MX hosts found for <%s>", node);
return;
}
extract(buf, mxhosts, mx);
lprintf(9, "Trying <%s>\n", buf);
sock = sock_connect(buf, "25", "tcp");
- snprintf(dsn, 256, "Could not connect: %s", strerror(errno));
+ snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
if (sock >= 0) lprintf(9, "Connected!\n");
- if (sock < 0) snprintf(dsn, 256, "%s", strerror(errno));
+ if (sock < 0) snprintf(dsn, SIZ, "%s", strerror(errno));
if (sock >= 0) break;
}
*
* Called by smtp_do_queue() to handle an individual message.
*/
-void smtp_do_procmsg(long msgnum) {
+void smtp_do_procmsg(long msgnum, void *userdata) {
struct CtdlMessage *msg;
char *instr = NULL;
char *results = NULL;
if (!strcasecmp(key, "retry")) {
/* double the retry interval after each attempt */
retry = extract_long(buf, 1) * 2L;
+ if (retry > SMTP_RETRY_MAX) {
+ retry = SMTP_RETRY_MAX;
+ }
remove_token(instr, i, '\n');
}
if (!strcasecmp(key, "attempted")) {
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = FMT_RFC822;
- msg->cm_fields['M'] = malloc(strlen(instr)+256);
+ msg->cm_fields['M'] = malloc(strlen(instr)+SIZ);
snprintf(msg->cm_fields['M'],
- strlen(instr)+256,
+ strlen(instr)+SIZ,
"Content-type: %s\n\n%s\n"
"attempted|%ld\n"
"retry|%ld\n",
return;
}
CtdlForEachMessage(MSGS_ALL, 0L, (-127),
- SPOOLMIME, NULL, smtp_do_procmsg);
+ SPOOLMIME, NULL, smtp_do_procmsg, NULL);
lprintf(7, "SMTP: queue run completed\n");
doing_queue = 0;
smtp_greeting,
smtp_command_loop);
- create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0);
+ create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0, 1);
CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
return "$Id$";
}
projects / citadel.git / blobdiff