From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 31 Aug 2001 00:14:55 +0000 (+0000)
Subject: Move Cyrus SASL forward for SASL/EXTERNAL
X-Git-Tag: OPENLDAP_REL_ENG_2_0_12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63791721eb8c2489d20a84de4eb8a1e194ed06f8;p=thirdparty%2Fopenldap.git

Move Cyrus SASL forward for SASL/EXTERNAL
---

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;