From 63791721eb8c2489d20a84de4eb8a1e194ed06f8 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 31 Aug 2001 00:14:55 +0000
Subject: [PATCH] Move Cyrus SASL forward for SASL/EXTERNAL

---
 libraries/libldap/open.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 47c5f6cfe9..987427684a 100644
--- 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;
-- 
2.47.2