X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Freferral.c;h=ea9dcfd86d533bd9119b18c53b98591f000017d3;hb=f3e0a28f18133100d0294db6dda4de1ea2539939;hp=ef8e5d7ca1e66faa5b3aadf84b149d191642a75c;hpb=63df7da68e29b140bcf98c3fd9f41e01b17686b8;p=openldap

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index ef8e5d7ca1..ea9dcfd86d 100644
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -1,7 +1,7 @@
-/* referral.c - LDBM backend referral handler */
+/* 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
  */
 
@@ -13,17 +13,15 @@
 #include "external.h"
 
 int
-bdb_referrals(
-    BackendDB	*be,
-    Connection	*conn,
-    Operation	*op,
-    const char *dn,
-    const char *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, *matched;
+
+	u_int32_t	locker;
+	DB_LOCK		lock;
 
 	if( op->o_tag == LDAP_REQ_SEARCH ) {
 		/* let search take care of itself */
@@ -35,68 +33,129 @@ bdb_referrals(
 		return rc;
 	} 
 
-	/* fetch entry */
-	rc = dn2entry_r( be, NULL, ndn, &e, &matched );
-
+	rc = LOCK_ID(bdb->bi_dbenv, &locker);
 	switch(rc) {
-	case DB_NOTFOUND:
 	case 0:
 		break;
 	default:
-		send_ldap_result( conn, op, rc=LDAP_OTHER,
-		    NULL, "internal error", NULL, NULL );
-		return rc;
+		return LDAP_OTHER;
 	}
 
-	if ( e == NULL ) {
-		char *matched_dn = NULL;
-		struct berval **refs = default_referral;
+dn2entry_retry:
+	/* get entry */
+	rc = bdb_dn2entry( op->o_bd, NULL, &op->o_req_ndn, &ei, 1, locker,
+		&lock, op->o_tmpmemctx );
 
-		if ( matched != NULL ) {
-			matched_dn = ch_strdup( matched->e_dn );
+	e = ei->bei_e;
+	switch(rc) {
+	case DB_NOTFOUND:
+	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 ); 
+#endif
+		send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
+		LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+		return rs->sr_err;
+	}
 
+	if ( rc == DB_NOTFOUND ) {
+		rc = 0;
+		rs->sr_matched = NULL;
+		if ( e != NULL ) {
+#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_name.bv_val );
+#else
 			Debug( LDAP_DEBUG_TRACE,
-				"ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
-				op->o_tag, dn, matched_dn );
-
-			refs = is_entry_referral( matched )
-				? get_entry_referrals( be, conn, op, matched )
-				: NULL;
-
-			bdb_entry_return( be, matched );
+				"bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+				(long) op->o_tag, op->o_req_dn.bv_val, e->e_name.bv_val );
+#endif
+
+			if( is_entry_referral( e ) ) {
+				rc = LDAP_OTHER;
+				rs->sr_ref = get_entry_referrals( op, e );
+				if ( rs->sr_ref ) {
+					rs->sr_matched = ber_strdup_x(
+					e->e_name.bv_val, op->o_tmpmemctx );
+				}
+			}
+
+			bdb_cache_return_entry_r (bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+			e = NULL;
+		} else if ( default_referral != NULL ) {
+			rc = LDAP_OTHER;
+			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 );
+			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 ) {
+			rs->sr_err = rc;
+			rs->sr_text = rs->sr_matched ? "bad referral object" : NULL;
+			send_ldap_result( op, rs );
 		}
 
-		if( matched != NULL ) {
-			ber_bvecfree( refs );
-			free( matched_dn );
+		LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+		if (rs->sr_matched) {
+			sl_free( (char *)rs->sr_matched, op->o_tmpmemctx );
+			rs->sr_matched = NULL;
 		}
-
 		return rc;
 	}
 
 	if ( is_entry_referral( e ) ) {
 		/* entry is a referral */
-		struct berval **refs = get_entry_referrals( be,
-			conn, op, e );
-
+		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_name.bv_val );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
-			op->o_tag, dn, e->e_dn );
-
-		if( refs != NULL ) {
-			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-		    	e->e_dn, NULL, refs, NULL );
+			"bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+			(long) op->o_tag, op->o_req_dn.bv_val, e->e_name.bv_val );
+#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_error( op, rs, LDAP_OTHER, "bad referral object" );
+			rc = rs->sr_err;
 		}
 
-		ber_bvecfree( 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;
 }