diff options
| -rw-r--r-- | mail/qmail/Makefile | 1 | ||||
| -rw-r--r-- | mail/qmail/files/auth.patch.patch-tls | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 0fa4474078d3..306e6faf83e7 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -238,6 +238,7 @@ SLAVEPORT_LINE= spamcontrol .endif SUB_FILES+= mailer.conf.sample bootfiles.sed enable-qmail +SUB_LIST+= ECHO_CMD=${ECHO_CMD} PKGINSTALL?= ${WRKDIR}/pkg-install .if defined(PKGMESSAGE_SUFFIX) diff --git a/mail/qmail/files/auth.patch.patch-tls b/mail/qmail/files/auth.patch.patch-tls index 7e59739051a4..e0ccd8b361bc 100644 --- a/mail/qmail/files/auth.patch.patch-tls +++ b/mail/qmail/files/auth.patch.patch-tls @@ -35,7 +35,7 @@ socket.lib` qmail-smtpd.0: \ -@@ -174,30 +176,38 @@ +@@ -174,30 +176,40 @@ stralloc greeting = {0}; *************** @@ -55,7 +55,7 @@ - void smtp_rset() ---- 241,255 ---- - } -+--- 277,298 ---- ++--- 277,300 ---- void smtp_ehlo(arg) char *arg; { -! smtp_greet("250-"); @@ -63,16 +63,18 @@ + smtp_greet("250-"); ++ #ifdef AUTHCRAM + #ifdef TLS -+! if (!ssl) out("\r\n250-STARTTLS AUTH LOGIN CRAM-MD5 PLAIN"); -+! if (!ssl) out("\r\n250-STARTTLS AUTH=LOGIN CRAM-MD5 PLAIN"); ++! if (!ssl) out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); ++! if (!ssl) out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); ++! if (!ssl) out("\r\n250-STARTTLS"); +! #else ! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); ! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN"); +! #endif +! #else +! #ifdef TLS -+! if (!ssl) out("\r\n250-STARTTLS AUTH LOGIN PLAIN"); -+! if (!ssl) out("\r\n250-STARTTLS AUTH=LOGIN PLAIN"); ++! if (!ssl) out("\r\n250-AUTH LOGIN PLAIN"); ++! if (!ssl) out("\r\n250-AUTH=LOGIN PLAIN"); ++! if (!ssl) out("\r\n250-STARTTLS"); ! #else ! out("\r\n250-AUTH LOGIN PLAIN"); ! out("\r\n250-AUTH=LOGIN PLAIN"); |