INN commit: trunk/innfeed (imap_connection.c)

[INN Commit]

    Date: Saturday, May 2, 2015 @ 08:32:10
  Author: iulius
Revision: 9837

innfeed/imap_connection.c:  fix support of Cyrus SASL 2.1.25 and later

Fix how sasl_callback_ft, added with Cyrus SASL 2.1.25, was handled
by innfeed.  See revision [9381] for more information.

Thanks to Dennis Preiser for the report.

Modified:
  trunk/innfeed/imap_connection.c

-------------------+
 imap_connection.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: imap_connection.c
===================================================================
--- imap_connection.c	2015-05-02 11:57:40 UTC (rev 9836)
+++ imap_connection.c	2015-05-02 15:32:10 UTC (rev 9837)
@@ -52,8 +52,8 @@
 # include <sasl/sasl.h>
 # include <sasl/saslplug.h>
 # include <sasl/saslutil.h>
-/* For Cyrus SASL versions < 2.1.24. */
-# ifndef sasl_callback_ft
+/* For Cyrus SASL versions < 2.1.25 (in hexadecimal notation below). */
+# if !defined (SASL_VERSION_FULL) || SASL_VERSION_FULL < 0x020119
 typedef int (*sasl_callback_ft)(void);
 # endif
 #endif