Set lock detector to DEFAULT, not NORUN.

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

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index c02b78b1a79459b00653115d8dbc0dd8c69addb2..64ee0caace11298c54673f799a01f1586556da7a 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
  */
 
@@ -36,7 +36,7 @@ bdb_referrals(
        } 
 
        /* get entry */
-       rc = bdb_dn2entry( be, NULL, ndn->bv_val, &e, &matched, 0 );
+       rc = bdb_dn2entry( be, NULL, ndn, &e, &matched, 0 );
 
        switch(rc) {
        case DB_NOTFOUND:
@@ -54,19 +54,18 @@ bdb_referrals(
 
        if ( e == NULL ) {
                char *matched_dn = NULL;
-               struct berval **refs = NULL;
+               BerVarray refs = NULL;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
 
                        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 );
 
                        if( is_entry_referral( matched ) ) {
                                rc = LDAP_OTHER;
-                               refs = get_entry_referrals( be, conn, op,
-                                       matched, dn->bv_val, LDAP_SCOPE_DEFAULT );
+                               refs = get_entry_referrals( be, conn, op, matched );
                        }
 
                        bdb_entry_return( be, matched );
@@ -74,14 +73,14 @@ bdb_referrals(
                } else if ( default_referral != NULL ) {
                        rc = LDAP_OTHER;
                        refs = referral_rewrite( default_referral,
-                               NULL, dn->bv_val, LDAP_SCOPE_DEFAULT );
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
                }
 
                if( refs != NULL ) {
                        /* 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,
@@ -94,10 +93,9 @@ bdb_referrals(
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral */
-               struct berval **refs = get_entry_referrals( be,
-                       conn, op, e, dn->bv_val, LDAP_SCOPE_DEFAULT );
-               struct berval **rrefs = referral_rewrite(
-                       refs, e->e_dn, dn->bv_val, LDAP_SCOPE_DEFAULT );
+               BerVarray refs = get_entry_referrals( be, conn, op, e );
+               BerVarray rrefs = referral_rewrite(
+                       refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT );
 
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
@@ -106,13 +104,13 @@ bdb_referrals(
                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 );