mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

- open the message file earlier after a successful MAIL command instead of

Browse Source 
waiting for the DATA command. this currently has no impact on the
	session but is needed for another change that will make submission
	of recipients safer with regard to "unexpected shutdowns at bad
	timings"
This commit is contained in:
gilles 2008-11-10 23:18:47 +00:00
parent e5836a4449
commit 7f96bf692c
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
usr.sbin/smtpd/smtp_session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: smtp_session.c,v 1.3 2008/11/10 17:24:24 deraadt Exp $ */
/* $OpenBSD: smtp_session.c,v 1.4 2008/11/10 23:18:47 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@ -365,9 +365,11 @@ session_rfc5321_mail_handler(struct session *s, char *args)
}
s->s_msg.rcptcount = 0;
s->s_state = S_MAIL;
s->s_state = S_MAILGETFILE;
s->s_flags |= F_IMSG_SENT;
s->s_msg.id = s->s_id;
s->s_msg.session_id = s->s_id;
s->s_msg.session_ss = s->s_ss;
log_debug("session_mail_handler: sending notification to mfa");
@ -456,13 +458,7 @@ session_rfc5321_data_handler(struct session *s, char *args)
}
s->s_state = S_DATA;
s->s_flags |= F_IMSG_SENT;
s->s_msg.session_id = s->s_id;
s->s_msg.session_ss = s->s_ss;
imsg_compose(s->s_env->sc_ibufs[PROC_QUEUE],
IMSG_QUEUE_CREATE_MESSAGE_FILE, 0, 0, -1, &s->s_msg,
sizeof(s->s_msg));
session_pickup(s, NULL);
return 1;
}
@ -594,7 +590,7 @@ session_pickup(struct session *s, struct submit_status *ss)
}
break;
case S_MAIL:
case S_MAILGETFILE:
/* sender was not accepted, downgrade state */
if (ss->code != 250) {
s->s_state = S_HELO;
@ -603,9 +599,25 @@ session_pickup(struct session *s, struct submit_status *ss)
return;
}
s->s_state = S_MAIL;
imsg_compose(s->s_env->sc_ibufs[PROC_QUEUE],
IMSG_QUEUE_CREATE_MESSAGE_FILE, 0, 0, -1, &s->s_msg,
sizeof(s->s_msg));
break;
case S_MAIL:
s->s_msg.sender = ss->u.path;
evbuffer_add_printf(s->s_bev->output,
"%d Sender ok\r\n", ss->code);
if (s->s_msg.datafp == NULL) {
/* Remove message file */
imsg_compose(s->s_env->sc_ibufs[PROC_QUEUE], IMSG_QUEUE_DELETE_MESSAGE_FILE,
0, 0, -1, &s->s_msg, sizeof(s->s_msg));
return;
}
break;
case S_RCPT:
@ -631,9 +643,6 @@ session_pickup(struct session *s, struct submit_status *ss)
case S_DATA:
if (s->s_msg.datafp == NULL) {
/* Remove message file */
imsg_compose(s->s_env->sc_ibufs[PROC_QUEUE], IMSG_QUEUE_DELETE_MESSAGE_FILE,
0, 0, -1, &s->s_msg, sizeof(s->s_msg));
evbuffer_add_printf(s->s_bev->output,
"%d %s\r\n", 421,
"Service temporarily unavailable");

3
usr.sbin/smtpd/smtpd.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: smtpd.h,v 1.7 2008/11/10 22:35:23 gilles Exp $ */
/* $OpenBSD: smtpd.h,v 1.8 2008/11/10 23:18:47 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@ -513,6 +513,7 @@ enum session_state {
S_TLS,
S_AUTH,
S_HELO,
S_MAILGETFILE,
S_MAIL,
S_RCPT,
S_DATA,