From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 1 Jan 2021 17:31:04 +0000 (+0000)
Subject: Authenticators: feature handling for upcoming GSASL version
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/90c2ddb98a7ae6ce99fb8f6312abbe34b7f561ba?hp=6454662ecb9e407c0616f0464c3e1f69829d14cf

Authenticators: feature handling for upcoming GSASL version
---

diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index 1aee4f7e7..12713705b 100644
--- a/src/src/auths/gsasl_exim.c
+++ b/src/src/auths/gsasl_exim.c
@@ -39,7 +39,11 @@ static void dummy(int x) { dummy2(x-1); }
 #include "gsasl_exim.h"
 
 
-#if GSASL_VERSION_MINOR >= 9
+#if GSASL_VERSION_MINOR >= 10
+# define EXIM_GSASL_HAVE_SCRAM_SHA_256
+# define EXIM_GSASL_SCRAM_S_KEY
+
+#elif GSASL_VERSION_MINOR == 9
 # define EXIM_GSASL_HAVE_SCRAM_SHA_256
 
 # if GSASL_VERSION_PATCH >= 1
@@ -48,6 +52,7 @@ static void dummy(int x) { dummy2(x-1); }
 # if GSASL_VERSION_PATCH < 2
 #  define CHANNELBIND_HACK
 # endif
+
 #else
 # define CHANNELBIND_HACK
 #endif