summaryrefslogtreecommitdiff
path: root/mail/sendmail-devel/files/patch-srvrsmtp.c
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2025-02-27 07:15:52 +0100
committerDirk Meyer <dinoex@FreeBSD.org>2025-02-27 07:15:52 +0100
commit94cd0af4ecc53d2ed7126d73ea634eb1f9d91998 (patch)
tree0925a957b9bcbb0dc6916a04c5037b524ada93cd /mail/sendmail-devel/files/patch-srvrsmtp.c
parentnet/miniupnpc: Update to 2.3.1 (diff)
mail/sendmail-devel: Update to 8.18.1.9
Diffstat (limited to 'mail/sendmail-devel/files/patch-srvrsmtp.c')
-rw-r--r--mail/sendmail-devel/files/patch-srvrsmtp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/mail/sendmail-devel/files/patch-srvrsmtp.c b/mail/sendmail-devel/files/patch-srvrsmtp.c
index 4abe95e30b78..1bc9071e43b4 100644
--- a/mail/sendmail-devel/files/patch-srvrsmtp.c
+++ b/mail/sendmail-devel/files/patch-srvrsmtp.c
@@ -1,6 +1,6 @@
---- sendmail/srvrsmtp.c.orig 2024-01-25 05:27:02 UTC
+--- sendmail/srvrsmtp.c.orig 2025-02-05 06:35:18 UTC
+++ sendmail/srvrsmtp.c
-@@ -940,6 +940,9 @@ do \
+@@ -972,6 +972,9 @@ do \
# define SHOWCMDINREPLY(inp) inp
# define SHOWSHRTCMDINREPLY(inp) shortenstring(inp, MAXSHORTSTR)
#endif
@@ -10,7 +10,7 @@
void
smtp(nullserver, d_flags, e)
-@@ -1528,6 +1531,8 @@ smtp(nullserver, d_flags, e)
+@@ -1563,6 +1566,8 @@ smtp(nullserver, d_flags, e)
/* check if data is on the socket during the pause */
if ((tp = channel_readable(InChannel, msecs)) != NULL)
{
@@ -19,7 +19,7 @@
greetcode = "554";
nullserver = "Command rejected";
sm_syslog(LOG_INFO, e->e_id,
-@@ -1537,6 +1542,8 @@ smtp(nullserver, d_flags, e)
+@@ -1572,6 +1577,8 @@ smtp(nullserver, d_flags, e)
(int) tp->tv_sec +
(tp->tv_usec >= 500000 ? 1 : 0)
);
@@ -28,7 +28,7 @@
}
}
}
-@@ -1655,6 +1662,10 @@ smtp(nullserver, d_flags, e)
+@@ -1691,6 +1698,10 @@ smtp(nullserver, d_flags, e)
SmtpPhase = "server cmd read";
sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient);
@@ -39,7 +39,7 @@
/* handle errors */
if (sm_io_error(OutChannel) ||
(p = sfgets(inp, sizeof(inp), InChannel,
-@@ -1965,8 +1976,11 @@ smtp(nullserver, d_flags, e)
+@@ -2006,8 +2017,11 @@ smtp(nullserver, d_flags, e)
#define LOGAUTHFAIL \
do \
{ \
@@ -51,7 +51,7 @@
if (LogLevel >= 9) \
sm_syslog(LOG_WARNING, e->e_id, \
"AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \
-@@ -2116,6 +2130,9 @@ smtp(nullserver, d_flags, e)
+@@ -2157,6 +2171,9 @@ smtp(nullserver, d_flags, e)
DELAY_CONN("AUTH");
if (!sasl_ok || n_mechs <= 0)
{
@@ -61,7 +61,7 @@
message("503 5.3.3 AUTH not available");
break;
}
-@@ -3841,10 +3858,17 @@ smtp(nullserver, d_flags, e)
+@@ -3894,10 +3911,17 @@ smtp(nullserver, d_flags, e)
** timeouts for the same connection.
*/
@@ -79,7 +79,7 @@
if (tTd(93, 100))
{
/* return to handle next connection */
-@@ -3926,7 +3950,10 @@ smtp(nullserver, d_flags, e)
+@@ -3979,7 +4003,10 @@ smtp(nullserver, d_flags, e)
#if MAXBADCOMMANDS > 0
if (++n_badcmds > MAXBADCOMMANDS)
{
@@ -90,7 +90,7 @@
message("421 4.7.0 %s Too many bad commands; closing connection",
MyHostName);
-@@ -3980,6 +4007,9 @@ smtp(nullserver, d_flags, e)
+@@ -4033,6 +4060,9 @@ smtp(nullserver, d_flags, e)
}
#if SASL
}