SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-21 01:41:26 +00:00
parent ed28f347da
commit cc6742f14d
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
20 changed files with 315 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

26
usr.sbin/smtpd/smtp_session.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: smtp_session.c,v 1.439 2024/01/03 08:11:15 op Exp $ */
/* $OpenBSD: smtp_session.c,v 1.440 2024/01/20 09:01:03 claudio Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@ -702,7 +702,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
const char *line, *helo;
uint64_t reqid, evpid;
uint32_t msgid;
int status, success;
int status, success, fd;
int filter_response;
const char *filter_param;
uint8_t i;
@ -802,19 +802,20 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
m_get_int(&m, &success);
m_end(&m);
fd = imsg_get_fd(imsg);
s = tree_xpop(&wait_queue_fd, reqid);
if (!success || imsg->fd == -1) {
if (imsg->fd != -1)
close(imsg->fd);
if (!success || fd == -1) {
if (fd != -1)
close(fd);
smtp_reply(s, "421 %s Temporary Error",
esc_code(ESC_STATUS_TEMPFAIL, ESC_OTHER_MAIL_SYSTEM_STATUS));
smtp_enter_state(s, STATE_QUIT);
return;
}
log_debug("smtp: %p: fd %d from queue", s, imsg->fd);
log_debug("smtp: %p: fd %d from queue", s, fd);
if (smtp_message_fd(s->tx, imsg->fd)) {
if (smtp_message_fd(s->tx, fd)) {
if (!SESSION_DATA_FILTERED(s))
smtp_message_begin(s->tx);
else
@ -828,19 +829,20 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
m_get_int(&m, &success);
m_end(&m);
fd = imsg_get_fd(imsg);
s = tree_xpop(&wait_filter_fd, reqid);
if (!success || imsg->fd == -1) {
if (imsg->fd != -1)
close(imsg->fd);
if (!success || fd == -1) {
if (fd != -1)
close(fd);
smtp_reply(s, "421 %s Temporary Error",
esc_code(ESC_STATUS_TEMPFAIL, ESC_OTHER_MAIL_SYSTEM_STATUS));
smtp_enter_state(s, STATE_QUIT);
return;
}
log_debug("smtp: %p: fd %d from lka", s, imsg->fd);
log_debug("smtp: %p: fd %d from lka", s, fd);
smtp_filter_fd(s->tx, imsg->fd);
smtp_filter_fd(s->tx, fd);
smtp_message_begin(s->tx);
return;