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 c32522d2dc1ec4f180685766204b01c8f438bb11..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
  */
 
@@ -17,8 +17,8 @@ bdb_referrals(
        BackendDB       *be,
        Connection      *conn,
        Operation       *op,
-       const char *dn,
-       const char *ndn,
+       struct berval *dn,
+       struct berval *ndn,
        const char **text )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -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, LDAP_SCOPE_DEFAULT );
+                               refs = get_entry_referrals( be, conn, op, matched );
                        }
 
                        bdb_entry_return( be, matched );
@@ -81,7 +80,7 @@ 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,
@@ -94,25 +93,24 @@ bdb_referrals(
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral */
-               struct berval **refs = get_entry_referrals( be,
-                       conn, op, e, dn, LDAP_SCOPE_DEFAULT );
-               struct berval **rrefs = referral_rewrite(
-                       refs, e->e_dn, dn, 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",
-                       (long) op->o_tag, dn, e->e_dn );
+                       (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 );
-                       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 );