]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/referral.c
ITS#2449, broken NOT filters
[openldap] / servers / slapd / back-bdb / referral.c
index 84f4a9efcc3372abe2b7c131a88319e7cc409540..6b6e741041dda3f6dcc6f49f0bae34f015f8ac81 100644 (file)
@@ -1,7 +1,7 @@
 /* referral.c - BDB backend referral handler */
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include "external.h"
 
 int
-bdb_referrals(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       struct berval *dn,
-       struct berval *ndn,
-       const char **text )
+bdb_referrals( Operation *op, SlapReply *rs )
 {
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       Entry *e = NULL;
+       EntryInfo *ei;
        int rc = LDAP_SUCCESS;
-       Entry *e = NULL, *matched;
+
+       u_int32_t       locker;
+       DB_LOCK         lock;
 
        if( op->o_tag == LDAP_REQ_SEARCH ) {
                /* let search take care of itself */
@@ -35,84 +33,124 @@ 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( op->o_bd, NULL, &op->o_req_ndn, &ei, 1, locker,
+               &lock, op->o_tmpmemctx );
 
+       e = ei->bei_e;
        switch(rc) {
        case DB_NOTFOUND:
-               rc = 0;
        case 0:
                break;
+       case LDAP_BUSY:
+               send_ldap_error( op, rs, LDAP_BUSY, "ldap server busy" );
+               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 ); 
-               send_ldap_result( conn, op, rc=LDAP_OTHER,
-                       NULL, "internal error", NULL, NULL );
-               return rc;
+#endif
+               send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
+               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+               return rs->sr_err;
        }
 
-       if ( e == NULL ) {
-               char *matched_dn = NULL;
-               BVarray refs = NULL;
-
-               if ( matched != NULL ) {
-                       matched_dn = ch_strdup( matched->e_dn );
+       if ( rc == DB_NOTFOUND ) {
+               rc = 0;
+               if ( e != NULL ) {
+                       rs->sr_matched = ch_strdup( e->e_name.bv_val );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+                       (long) op->o_tag, op->o_req_dn.bv_val, rs->sr_matched );
+#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, op->o_req_dn.bv_val, rs->sr_matched );
+#endif
 
-                       if( is_entry_referral( matched ) ) {
+                       if( is_entry_referral( e ) ) {
                                rc = LDAP_OTHER;
-                               refs = get_entry_referrals( be, conn, op, matched );
+                               rs->sr_ref = get_entry_referrals( op, e );
                        }
 
-                       bdb_entry_return( be, matched );
-                       matched = NULL;
+                       bdb_cache_return_entry_r (bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+                       e = NULL;
                } else if ( default_referral != NULL ) {
                        rc = LDAP_OTHER;
-                       refs = referral_rewrite( default_referral,
-                               NULL, dn, LDAP_SCOPE_DEFAULT );
+                       rs->sr_ref = referral_rewrite( default_referral,
+                               NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                }
 
-               if( refs != NULL ) {
+               if( rs->sr_ref != NULL ) {
                        /* send referrals */
-                       send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               matched_dn, NULL, refs, NULL );
-                       bvarray_free( refs );
+                       rs->sr_err = LDAP_REFERRAL;
+                       send_ldap_result( op, rs );
+                       ber_bvarray_free( rs->sr_ref );
+                       rs->sr_ref = NULL;
                } else if ( rc != LDAP_SUCCESS ) {
-                       send_ldap_result( conn, op, rc, matched_dn,
-                               matched_dn ? "bad referral object" : NULL,
-                               NULL, NULL );
+                       rs->sr_err = rc;
+                       rs->sr_text = rs->sr_matched ? "bad referral object" : NULL;
+                       send_ldap_result( op, rs );
                }
 
-               free( matched_dn );
+               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+               free( (char *)rs->sr_matched );
+               rs->sr_matched = NULL;
                return rc;
        }
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral */
-               BVarray refs = get_entry_referrals( be, conn, op, e );
-               BVarray rrefs = referral_rewrite(
-                       refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT );
+               BerVarray refs = get_entry_referrals( op, e );
+               rs->sr_ref = referral_rewrite(
+                       refs, &e->e_name, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+                       (long) op->o_tag, op->o_req_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 );
-
-               if( rrefs != NULL ) {
-                       send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               e->e_dn, NULL, rrefs, NULL );
-                       bvarray_free( rrefs );
+                       (long) op->o_tag, op->o_req_dn.bv_val, e->e_dn );
+#endif
+
+               rs->sr_matched = e->e_name.bv_val;
+               if( rs->sr_ref != NULL ) {
+                       rs->sr_err = LDAP_REFERRAL;
+                       send_ldap_result( op, rs );
+                       ber_bvarray_free( rs->sr_ref );
+                       rs->sr_ref = NULL;
                } else {
-                       send_ldap_result( conn, op, rc = LDAP_OTHER, e->e_dn,
-                               "bad referral object", NULL, NULL );
+                       send_ldap_error( op, rs, LDAP_OTHER, "bad referral object" );
+                       rc = rs->sr_err;
                }
 
-               bvarray_free( refs );
+               rs->sr_matched = NULL;
+               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;
 }