diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2018-12-30 14:04:19 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2018-12-30 14:04:19 +0000 |
| commit | 54ac934cb1ce39a867a3e32eb547c20225e52a8a (patch) | |
| tree | ad2194eb36204b18da1495a5aed249f081d293d7 /mail/sendmail | |
| parent | d21dd5b9fc0d6d748e4b3992c7a58609ee85aa8c (diff) | |
| download | ports-54ac934cb1ce39a867a3e32eb547c20225e52a8a.tar.gz ports-54ac934cb1ce39a867a3e32eb547c20225e52a8a.zip | |
- extend blacklisting
- cleanup rsa glue
Notes
Notes:
svn path=/head/; revision=488717
Diffstat (limited to 'mail/sendmail')
| -rw-r--r-- | mail/sendmail/Makefile | 2 | ||||
| -rw-r--r-- | mail/sendmail/files/patch-srvrsmtp.c | 12 | ||||
| -rw-r--r-- | mail/sendmail/files/patch-tls.c | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index bc7b9e18fe29..5efdc9bc9c90 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -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} diff --git a/mail/sendmail/files/patch-srvrsmtp.c b/mail/sendmail/files/patch-srvrsmtp.c index 93308578ed07..961aba88eea2 100644 --- a/mail/sendmail/files/patch-srvrsmtp.c +++ b/mail/sendmail/files/patch-srvrsmtp.c @@ -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) { diff --git a/mail/sendmail/files/patch-tls.c b/mail/sendmail/files/patch-tls.c index 37275cb07bf5..209beb5663e9 100644 --- a/mail/sendmail/files/patch-tls.c +++ b/mail/sendmail/files/patch-tls.c @@ -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; |