Delete CDB (no transactions) support

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

diff --git a/servers/slapd/back-bdb/bind.c b/servers/slapd/back-bdb/bind.c
index a85fb468ba5cedbe4c05a69fee3e08a5319278cc..1c682e4b4b89485b5babb678c34cc1e863b4e824 100644 (file)
--- a/servers/slapd/back-bdb/bind.c
+++ b/servers/slapd/back-bdb/bind.c
@@ -1,7 +1,7 @@
 /* bind.c - bdb backend bind routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -20,11 +20,11 @@ bdb_bind(
        Backend         *be,
        Connection              *conn,
        Operation               *op,
-       const char              *dn,
-       const char              *ndn,
+       struct berval           *dn,
+       struct berval           *ndn,
        int                     method,
        struct berval   *cred,
-       char**  edn
+       struct berval   *edn
 )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -40,12 +40,10 @@ bdb_bind(
 
        AttributeDescription *password = slap_schema.si_ad_userPassword;
 
-       Debug( LDAP_DEBUG_ARGS, "==> bdb_bind: dn: %s\n", dn, 0, 0);
-
-       *edn = NULL;
+       Debug( LDAP_DEBUG_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0);
 
        /* get entry */
-       rc = bdb_dn2entry( be, NULL, ndn, &e, &matched, 0 );
+       rc = bdb_dn2entry_r( be, NULL, ndn, &e, &matched, 0 );
 
        switch(rc) {
        case DB_NOTFOUND:
@@ -60,17 +58,16 @@ bdb_bind(
        /* get entry with reader lock */
        if ( e == NULL ) {
                char *matched_dn = NULL;
-               struct berval **refs;
+               BerVarray refs;
 
                if( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
 
                        refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched,
-                                       dn, LDAP_SCOPE_DEFAULT )
+                               ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
 
-                       bdb_entry_return( be, matched );
+                       bdb_cache_return_entry_r( &bdb->bi_cache, matched );
                        matched = NULL;
 
                } else {
@@ -82,7 +79,7 @@ bdb_bind(
                rc = 1;
                if ( method == LDAP_AUTH_SIMPLE ) {
                        if ( be_isroot_pw( be, conn, ndn, cred ) ) {
-                               *edn = ch_strdup( be_root_dn( be ) );
+                               ber_dupbv( edn, be_root_dn( be ) );
                                rc = LDAP_SUCCESS; /* front end will send result */
 
                        } else if ( refs != NULL ) {
@@ -103,13 +100,13 @@ bdb_bind(
                                NULL, NULL, NULL, NULL );
                }
 
-               ber_bvecfree( refs );
+               ber_bvarray_free( refs );
                free( matched_dn );
 
                return rc;
        }
 
-       *edn = ch_strdup( e->e_dn );
+       ber_dupbv( edn, &e->e_name );
 
        /* check for deleted */
 
@@ -126,8 +123,8 @@ bdb_bind(
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral, don't allow bind */
-               struct berval **refs = get_entry_referrals( be,
-                       conn, op, e, dn, LDAP_SCOPE_DEFAULT );
+               BerVarray refs = get_entry_referrals( be,
+                       conn, op, e );
 
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                        0, 0 );
@@ -141,7 +138,7 @@ bdb_bind(
                                NULL, NULL, NULL, NULL );
                }
 
-               ber_bvecfree( refs );
+               ber_bvarray_free( refs );
 
                goto done;
        }
@@ -151,8 +148,8 @@ bdb_bind(
                /* check for root dn/passwd */
                if ( be_isroot_pw( be, conn, ndn, cred ) ) {
                        /* front end will send result */
-                       if(*edn != NULL) free( *edn );
-                       *edn = ch_strdup( be_root_dn( be ) );
+                       if(edn->bv_val != NULL) free( edn->bv_val );
+                       ber_dupbv( edn, be_root_dn( be ) );
                        rc = LDAP_SUCCESS;
                        goto done;
                }
@@ -201,7 +198,7 @@ bdb_bind(
 
                if ( (a = attr_find( e->e_attrs, krbattr )) == NULL ) {
                        /*
-                        * no krbname values present:  check against DN
+                        * no krbname values present: check against DN
                         */
                        if ( strcasecmp( dn, krbname ) == 0 ) {
                                rc = 0;
@@ -243,7 +240,7 @@ bdb_bind(
 done:
        /* free entry and reader lock */
        if( e != NULL ) {
-               bdb_entry_return( be, e );
+               bdb_cache_return_entry_r( &bdb->bi_cache, e );
        }
 
        /* front end with send result on success (rc==0) */