-/* $OpenBSD: smtp_session.c,v 1.437 2023/11/03 13:38:28 op Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.438 2023/12/23 10:29:05 op Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
*/
case CMD_QUIT:
if (!smtp_check_noparam(s, args))
- break;
+ break;
smtp_filter_phase(FILTER_QUIT, s, NULL);
break;
case CMD_HELP:
if (!smtp_check_noparam(s, args))
- break;
+ break;
smtp_proceed_help(s, NULL);
break;
case CMD_WIZ:
if (!smtp_check_noparam(s, args))
- break;
+ break;
smtp_proceed_wiz(s, NULL);
break;
struct mailaddr sender;
(void)strlcpy(tmp, args, sizeof tmp);
- copy = tmp;
+ copy = tmp;
if (s->helo[0] == '\0' || s->tx) {
smtp_reply(s, "503 %s %s: Command not allowed at this point.",
char tmp[SMTP_LINE_MAX];
(void)strlcpy(tmp, args, sizeof tmp);
- copy = tmp;
+ copy = tmp;
if (s->tx == NULL) {
smtp_reply(s, "503 %s %s: Command not allowed at this point.",
char tmp[SMTP_LINE_MAX];
(void)strlcpy(tmp, args, sizeof tmp);
- copy = tmp;
+ copy = tmp;
if (!smtp_tx(s)) {
smtp_reply(s, "421 %s Temporary Error",
char tmp[SMTP_LINE_MAX];
(void)strlcpy(tmp, line, sizeof tmp);
- copy = tmp;
+ copy = tmp;
if (smtp_mailaddr(&tx->evp.sender, copy, 1, ©,
tx->session->smtpname) == 0) {
char tmp[SMTP_LINE_MAX];
(void)strlcpy(tmp, line, sizeof tmp);
- copy = tmp;
+ copy = tmp;
if (tx->rcptcount >= env->sc_session_max_rcpt) {
smtp_reply(tx->session, "451 %s %s: Too many recipients",
log_debug("smtp: %p: message begin", s);
smtp_reply(s, "354 Enter mail, end with \".\""
- " on a line by itself");
-
+ " on a line by itself");
+
if (s->junk || (s->tx && s->tx->junk))
m_printf(tx, "X-Spam: Yes\n");
switch(tx->error) {
case TX_OK:
smtp_tx_commit(tx);
- return;
+ return;
case TX_ERROR_SIZE:
smtp_reply(s, "554 %s %s: Transaction failed, message too big",