From d835b37be602f75473644714ff7884b0082ba06f Mon Sep 17 00:00:00 2001 From: op Date: Sat, 23 Dec 2023 10:29:05 +0000 Subject: [PATCH] remove trailing whitespaces --- usr.sbin/smtpd/smtp_session.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 7848ece404a..f0ede548968 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $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 @@ -1339,7 +1339,7 @@ smtp_command(struct smtp_session *s, char *line) */ case CMD_QUIT: if (!smtp_check_noparam(s, args)) - break; + break; smtp_filter_phase(FILTER_QUIT, s, NULL); break; @@ -1351,13 +1351,13 @@ smtp_command(struct smtp_session *s, char *line) 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; @@ -1528,7 +1528,7 @@ smtp_check_mail_from(struct smtp_session *s, const char *args) 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.", @@ -1580,7 +1580,7 @@ smtp_check_rcpt_to(struct smtp_session *s, const char *args) 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.", @@ -1838,7 +1838,7 @@ smtp_proceed_mail_from(struct smtp_session *s, const char *args) 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", @@ -2347,7 +2347,7 @@ smtp_tx_mail_from(struct smtp_tx *tx, const char *line) 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) { @@ -2428,7 +2428,7 @@ smtp_tx_rcpt_to(struct smtp_tx *tx, const char *line) 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", @@ -2752,8 +2752,8 @@ smtp_message_begin(struct smtp_tx *tx) 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"); @@ -2816,7 +2816,7 @@ smtp_message_end(struct smtp_tx *tx) 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", -- 2.20.1