Re: SMTP AUTH not working with recent sendmail

[Stephen Borrill <netbsd%precedence.co.uk@localhost>]

On Tue, 10 May 2022, Stephen Borrill wrote:
> On Mon, 9 May 2022, John Klos wrote:
> > I've been trying to figure out why SMTP AUTH with sendmail stopped working 
> > some months ago, perhaps with the update to 8.16.1. Many dead ends until I 
> > found these threads:
> >
> > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262935
> > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263287
> >
> > The fix is in the sendmail-8.17.1.9 snapshot, but not 8.17.1. Until the 
> > option to update to a fixed release version is available, perhaps we should 
> > include the simple #define SASL_AUTH_AUTH 0x1000 -> 0x10000 patch. Tested 
> > here on multiple systems. Any objections?
>
> Hi John,
>
> I moaned about this here:
> http://mail-index.netbsd.org/netbsd-users/2022/04/21/msg028435.html
>
> I found that downgrading to cyrus-sasl 2.1.27 from 2.1.28 fixed it for me, 
> but I guess the root cause is that 2.1.28 tickles the sendmail bug whereas 
> 2.1.27 does not.
>
> I say get it committed and get pullups requested as currently pkgsrc 2022Q1 
> does not have working SMTP AUTH.

sasl.patch attached patches patch-bo (also attached in its entirety) as 
well as bumping the PKGREVISION.

Tested working.

I can commit and file pullupsif you want.

--
Stephen

? sasl.patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sendmail/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- Makefile	9 Nov 2021 22:02:36 -0000	1.140
+++ Makefile	10 May 2022 10:59:29 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.140 2021/11/09 22:02:36 jnemeth Exp $
 
 PKGNAME=	sendmail-${DIST_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	The well known Mail Transport Agent
 
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sendmail/distinfo,v
retrieving revision 1.67
diff -u -r1.67 distinfo
--- distinfo	19 Dec 2021 04:01:11 -0000	1.67
+++ distinfo	10 May 2022 10:59:29 -0000
@@ -31,7 +31,7 @@
 SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
 SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9
 SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9
-SHA1 (patch-bo) = ca819c8f8de9bd67b7e6d5738020c90b03c6fad8
+SHA1 (patch-bo) = e55b2cb4ee31fdfa593a307b4ec8ca0799f55060
 SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
 SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
 SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36
Index: patches/patch-bo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sendmail/patches/patch-bo,v
retrieving revision 1.4
diff -u -r1.4 patch-bo
--- patches/patch-bo	4 Jul 2021 07:57:13 -0000	1.4
+++ patches/patch-bo	10 May 2022 10:59:29 -0000
@@ -1,8 +1,12 @@
-$NetBSD: patch-bo,v 1.4 2021/07/04 07:57:13 jnemeth Exp $
+$NetBSD$
+
+Add blacklist support.
+Pull up SMTP AUTH fix from 8.17.1.9 as per:
+	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262935
 
 --- sendmail/sendmail.h.orig	2020-07-02 05:00:37.000000000 +0000
-+++ sendmail/sendmail.h
-@@ -63,6 +63,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)
++++ sendmail/sendmail.h	2022-05-10 09:51:29.162720330 +0000
+@@ -63,6 +63,10 @@
  #endif
  
  #include "bf.h"
@@ -13,7 +17,16 @@
  #include "timers.h"
  #include <sm/exc.h>
  #include <sm/heap.h>
-@@ -2576,6 +2580,8 @@ EXTERN int Hacks;	/* bit field of run-ti
+@@ -706,7 +710,7 @@
+ # define SASL_IS_AUTH	2		/* authenticated */
+ 
+ /* SASL options */
+-# define SASL_AUTH_AUTH	0x1000		/* use auth= only if authenticated */
++# define SASL_AUTH_AUTH	0x10000		/* use auth= only if authenticated */
+ # if SASL >= 20101
+ #  define SASL_SEC_MASK	SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
+ # else /* SASL >= 20101 */
+@@ -2576,6 +2580,8 @@
  
  EXTERN int ConnectionRateWindowSize;
  

$NetBSD$

Add blacklist support.
Pull up SMTP AUTH fix from 8.17.1.9 as per:
	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262935

--- sendmail/sendmail.h.orig	2020-07-02 05:00:37.000000000 +0000
+++ sendmail/sendmail.h	2022-05-10 09:51:29.162720330 +0000
@@ -63,6 +63,10 @@
 #endif
 
 #include "bf.h"
+#ifdef USE_BLACKLIST
+#include <blacklist.h>
+#endif
+#include "blacklist_client.h"
 #include "timers.h"
 #include <sm/exc.h>
 #include <sm/heap.h>
@@ -706,7 +710,7 @@
 # define SASL_IS_AUTH	2		/* authenticated */
 
 /* SASL options */
-# define SASL_AUTH_AUTH	0x1000		/* use auth= only if authenticated */
+# define SASL_AUTH_AUTH	0x10000		/* use auth= only if authenticated */
 # if SASL >= 20101
 #  define SASL_SEC_MASK	SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
 # else /* SASL >= 20101 */
@@ -2576,6 +2580,8 @@
 
 EXTERN int ConnectionRateWindowSize;
 
+EXTERN bool	UseBlacklist;
+
 /*
 **  Declarations of useful functions
 */