Import ITS#2926 fix from HEAD

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 580fa5e7ed29bbfe54f7447809b99da342bafef2..cbfae04a3e73fc509c3b5018c78e571688b522a2 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -39,23 +39,23 @@ ldap_pvt_thread_mutex_t ldap_int_sasl_mutex;
 * Various Cyrus SASL related stuff.
 */
 
+static const sasl_callback_t client_callbacks[] = {
+#ifdef SASL_CB_GETREALM
+       { SASL_CB_GETREALM, NULL, NULL },
+#endif
+       { SASL_CB_USER, NULL, NULL },
+       { SASL_CB_AUTHNAME, NULL, NULL },
+       { SASL_CB_PASS, NULL, NULL },
+       { SASL_CB_ECHOPROMPT, NULL, NULL },
+       { SASL_CB_NOECHOPROMPT, NULL, NULL },
+       { SASL_CB_LIST_END, NULL, NULL }
+};
+
 int ldap_int_sasl_init( void )
 {
        /* XXX not threadsafe */
        static int sasl_initialized = 0;
 
-       static sasl_callback_t client_callbacks[] = {
-#ifdef SASL_CB_GETREALM
-               { SASL_CB_GETREALM, NULL, NULL },
-#endif
-               { SASL_CB_USER, NULL, NULL },
-               { SASL_CB_AUTHNAME, NULL, NULL },
-               { SASL_CB_PASS, NULL, NULL },
-               { SASL_CB_ECHOPROMPT, NULL, NULL },
-               { SASL_CB_NOECHOPROMPT, NULL, NULL },
-               { SASL_CB_LIST_END, NULL, NULL }
-       };
-
 #ifdef HAVE_SASL_VERSION
 #define SASL_BUILD_VERSION ((SASL_VERSION_MAJOR << 24) |\
        (SASL_VERSION_MINOR << 16) | SASL_VERSION_STEP)
@@ -101,7 +101,7 @@ int ldap_int_sasl_init( void )
        ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
 #endif
 
-       if ( sasl_client_init( client_callbacks ) == SASL_OK ) {
+       if ( sasl_client_init( NULL ) == SASL_OK ) {
                sasl_initialized = 1;
                return 0;
        }
@@ -474,9 +474,9 @@ ldap_int_sasl_open(
 
 #if SASL_VERSION_MAJOR >= 2
        rc = sasl_client_new( "ldap", host, NULL, NULL,
-               NULL, 0, &ctx );
+               client_callbacks, 0, &ctx );
 #else
-       rc = sasl_client_new( "ldap", host, NULL,
+       rc = sasl_client_new( "ldap", host, client_callbacks,
                SASL_SECURITY_LAYER, &ctx );
 #endif