fix the problem right now

[openldap] / servers / slapd / back-meta / bind.c

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index d7e7e79d32e30ecfe976d1e57353d2ce79b7e07c..c3736c47e9e9eac1b16d96a9fbfbd70ed20088a5 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -195,6 +195,7 @@ meta_back_do_single_bind(
        ber_int_t       msgid;
        dncookie        dc;
        struct metasingleconn   *lsc = &lc->conns[ candidate ];
+       LDAPMessage     *res;
        
        /*
         * Rewrite the bind dn if needed
@@ -217,38 +218,41 @@ meta_back_do_single_bind(
                        goto return_results;
                }
        }
-       
-       rs->sr_err = ldap_sasl_bind(lsc->ld, mdn.bv_val,
+
+       /* FIXME: this fixes the bind problem right now; we need
+        * to use the asynchronous version to get the "matched"
+        * and more in case of failure ... */
+       rs->sr_err = ldap_sasl_bind_s(lsc->ld, mdn.bv_val,
                        LDAP_SASL_SIMPLE, &op->oq_bind.rb_cred,
-                       op->o_ctrls, NULL, &msgid);
+                       op->o_ctrls, NULL, NULL);
        if ( rs->sr_err != LDAP_SUCCESS ) {
                rs->sr_err = ldap_back_map_result( rs );
+               goto return_results;
+       }
 
-       } else {
-               /*
-                * FIXME: handle response!!!
-                */
-               if ( lsc->bound_dn.bv_val != NULL ) {
-                       ber_memfree( lsc->bound_dn.bv_val );
-               }
-               ber_dupbv( &lsc->bound_dn, &op->o_req_dn );
-               lsc->bound = META_BOUND;
-               lc->bound_target = candidate;
-
-               if ( li->savecred ) {
-                       if ( lsc->cred.bv_val ) {
-                               memset( lsc->cred.bv_val, 0, lsc->cred.bv_len );
-                               ber_memfree( lsc->cred.bv_val );
-                       }
-                       ber_dupbv( &lsc->cred, &op->oq_bind.rb_cred );
-                       ldap_set_rebind_proc( lsc->ld, meta_back_rebind, lsc );
-               }
+       /*
+        * FIXME: handle response!!!
+        */
+       if ( lsc->bound_dn.bv_val != NULL ) {
+               ber_memfree( lsc->bound_dn.bv_val );
+       }
+       ber_dupbv( &lsc->bound_dn, &op->o_req_dn );
+       lsc->bound = META_BOUND;
+       lc->bound_target = candidate;
 
-               if ( li->cache.ttl != META_DNCACHE_DISABLED
-                               && op->o_req_ndn.bv_len != 0 ) {
-                       ( void )meta_dncache_update_entry( &li->cache,
-                                       &op->o_req_ndn, candidate );
+       if ( li->savecred ) {
+               if ( lsc->cred.bv_val ) {
+                       memset( lsc->cred.bv_val, 0, lsc->cred.bv_len );
+                       ber_memfree( lsc->cred.bv_val );
                }
+               ber_dupbv( &lsc->cred, &op->oq_bind.rb_cred );
+               ldap_set_rebind_proc( lsc->ld, meta_back_rebind, lsc );
+       }
+
+       if ( li->cache.ttl != META_DNCACHE_DISABLED
+                       && op->o_req_ndn.bv_len != 0 ) {
+               ( void )meta_dncache_update_entry( &li->cache,
+                               &op->o_req_ndn, candidate );
        }
 
 return_results:;