Move Cyrus SASL forward for SASL/EXTERNAL

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 47c5f6cfe9d4936407c2c6a62697a0960d478c7f..987427684ac95d23263ffb0792f3639b5c18175d 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -321,6 +321,12 @@ ldap_int_open_connection(
                INT_MAX, (void *)"ldap_" );
 #endif
 
+#ifdef HAVE_CYRUS_SASL
+       if( sasl_host != NULL ) {
+               ldap_int_sasl_open( ld, conn, sasl_host, sasl_ssf );
+       }
+#endif
+
 #ifdef HAVE_TLS
        if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
                strcmp( srv->lud_scheme, "ldaps" ) == 0 )
@@ -337,12 +343,6 @@ ldap_int_open_connection(
        }
 #endif
 
-#ifdef HAVE_CYRUS_SASL
-       if( sasl_host != NULL ) {
-               ldap_int_sasl_open( ld, conn, sasl_host, sasl_ssf );
-       }
-#endif
-
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        if ( conn->lconn_krbinstance == NULL ) {
                char *c;