Patch: Delete the buggy surrogate parent code (ITS#1815)

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

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index 941a34d04256f83d1077b2be1db7ecec24337e5a..1ecbf1dddce1b3c1f16c867836c8e67adf61914c 100644 (file)
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -1,7 +1,7 @@
 /* referral.c - BDB backend referral handler */
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -23,7 +23,11 @@ bdb_referrals(
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        int rc = LDAP_SUCCESS;
-       Entry *e = NULL, *matched;
+       Entry *e = NULL;
+       Entry *matched = NULL;
+
+       u_int32_t       locker;
+       DB_LOCK         lock;
 
        if( op->o_tag == LDAP_REQ_SEARCH ) {
                /* let search take care of itself */
@@ -35,40 +39,82 @@ bdb_referrals(
                return rc;
        } 
 
+       rc = LOCK_ID(bdb->bi_dbenv, &locker);
+       switch(rc) {
+       case 0:
+               break;
+       default:
+               return LDAP_OTHER;
+       }
+
+dn2entry_retry:
        /* get entry */
-       rc = bdb_dn2entry( be, NULL, ndn, &e, &matched, 0 );
+       rc = bdb_dn2entry_r( be, NULL, ndn, &e, &matched, 0, locker, &lock );
 
        switch(rc) {
        case DB_NOTFOUND:
                rc = 0;
        case 0:
                break;
+       case LDAP_BUSY:
+               if (e != NULL) {
+                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+               }
+               if (matched != NULL) {
+                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, matched, &lock);
+               }
+               send_ldap_result( conn, op, LDAP_BUSY,
+                       NULL, "ldap server busy", NULL, NULL );
+               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+               return LDAP_BUSY;
+       case DB_LOCK_DEADLOCK:
+       case DB_LOCK_NOTGRANTED:
+               goto dn2entry_retry;
        default:
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_referrals: dn2entry failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_referrals: dn2entry failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 ); 
+#endif
+               if (e != NULL) {
+                        bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+               }
+                if (matched != NULL) {
+                        bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, matched, &lock);
+               }
                send_ldap_result( conn, op, rc=LDAP_OTHER,
                        NULL, "internal error", NULL, NULL );
+               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
                return rc;
        }
 
        if ( e == NULL ) {
                char *matched_dn = NULL;
-               struct berval **refs = NULL;
+               BerVarray refs = NULL;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+                       (long) op->o_tag, dn->bv_val, matched_dn );
+#else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
-                               (long) op->o_tag, dn, matched_dn );
+                               (long) op->o_tag, dn->bv_val, matched_dn );
+#endif
 
                        if( is_entry_referral( matched ) ) {
                                rc = LDAP_OTHER;
                                refs = get_entry_referrals( be, conn, op, matched );
                        }
 
-                       bdb_entry_return( be, matched );
+                       bdb_cache_return_entry_r (bdb->bi_dbenv, &bdb->bi_cache, matched, &lock);
                        matched = NULL;
                } else if ( default_referral != NULL ) {
                        rc = LDAP_OTHER;
@@ -80,40 +126,47 @@ bdb_referrals(
                        /* send referrals */
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                                matched_dn, NULL, refs, NULL );
-                       ber_bvecfree( refs );
+                       ber_bvarray_free( refs );
                } else if ( rc != LDAP_SUCCESS ) {
                        send_ldap_result( conn, op, rc, matched_dn,
                                matched_dn ? "bad referral object" : NULL,
                                NULL, NULL );
                }
 
+               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
                free( matched_dn );
                return rc;
        }
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral */
-               struct berval **refs = get_entry_referrals( be,
-                       conn, op, e );
-               struct berval **rrefs = referral_rewrite(
+               BerVarray refs = get_entry_referrals( be, conn, op, e );
+               BerVarray rrefs = referral_rewrite(
                        refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+                       (long) op->o_tag, dn->bv_val, e->e_dn );
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
                        (long) op->o_tag, dn->bv_val, e->e_dn );
+#endif
 
                if( rrefs != NULL ) {
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                                e->e_dn, NULL, rrefs, NULL );
-                       ber_bvecfree( rrefs );
+                       ber_bvarray_free( rrefs );
                } else {
                        send_ldap_result( conn, op, rc = LDAP_OTHER, e->e_dn,
                                "bad referral object", NULL, NULL );
                }
 
-               ber_bvecfree( refs );
+               ber_bvarray_free( refs );
        }
 
-       bdb_entry_return( be, e );
+       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+       LOCK_ID_FREE ( bdb->bi_dbenv, locker );
        return rc;
 }