svn commit: r488717 - in head/mail/sendmail: . files
Dirk Meyer
dinoex at FreeBSD.org
Sun Dec 30 14:04:21 UTC 2018
Author: dinoex
Date: Sun Dec 30 14:04:19 2018
New Revision: 488717
URL: https://svnweb.freebsd.org/changeset/ports/488717
Log:
- extend blacklisting
- cleanup rsa glue
Modified:
head/mail/sendmail/Makefile
head/mail/sendmail/files/patch-srvrsmtp.c
head/mail/sendmail/files/patch-tls.c
Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile Sun Dec 30 14:00:46 2018 (r488716)
+++ head/mail/sendmail/Makefile Sun Dec 30 14:04:19 2018 (r488717)
@@ -2,7 +2,7 @@
PORTNAME= sendmail
PORTVERSION= 8.15.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
DISTNAME= ${PORTNAME}.${PORTVERSION}
Modified: head/mail/sendmail/files/patch-srvrsmtp.c
==============================================================================
--- head/mail/sendmail/files/patch-srvrsmtp.c Sun Dec 30 14:00:46 2018 (r488716)
+++ head/mail/sendmail/files/patch-srvrsmtp.c Sun Dec 30 14:04:19 2018 (r488717)
@@ -20,7 +20,17 @@
if (LogLevel > 9)
sm_syslog(LOG_WARNING, e->e_id,
"AUTH failure (%s): %s (%d) %s, relay=%.100s",
-@@ -3523,7 +3527,10 @@ doquit:
+@@ -1867,6 +1871,9 @@ smtp(nullserver, d_flags, e)
+ DELAY_CONN("AUTH");
+ if (!sasl_ok || n_mechs <= 0)
+ {
++ int fd;
++ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
++ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "AUTH LOGIN FAIL");
+ message("503 5.3.3 AUTH not available");
+ break;
+ }
+@@ -3523,7 +3530,10 @@ doquit:
#if MAXBADCOMMANDS > 0
if (++n_badcmds > MAXBADCOMMANDS)
{
Modified: head/mail/sendmail/files/patch-tls.c
==============================================================================
--- head/mail/sendmail/files/patch-tls.c Sun Dec 30 14:00:46 2018 (r488716)
+++ head/mail/sendmail/files/patch-tls.c Sun Dec 30 14:04:19 2018 (r488717)
@@ -94,10 +94,10 @@
+ int rc;
+
+ bn_rsa_r4 = BN_new();
-+ rc = BN_set_word(bn_rsa_r4, RSA_F4);
-+ if ((bn_rsa_r4 != NULL) && BN_set_word(bn_rsa_r4, RSA_F4) && (rsa = RSA_new()) != NULL)
++ rc = BN_set_word(bn_rsa_r4, e);
++ if ((bn_rsa_r4 != NULL) && BN_set_word(bn_rsa_r4, e) && (rsa = RSA_new()) != NULL)
+ {
-+ if (!RSA_generate_key_ex(rsa, RSA_KEYLENGTH, bn_rsa_r4, NULL))
++ if (!RSA_generate_key_ex(rsa, num, bn_rsa_r4, NULL))
+ {
+ RSA_free(rsa);
+ rsa = NULL;
More information about the svn-ports-all
mailing list