From: Howard Chu <hyc@openldap.org>
Date: Thu, 12 Jun 2003 11:17:35 +0000 (+0000)
Subject: Another BDB_HIER redundant modification
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~889
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c3039b66fe76ac285988c8ef80926276a9433da4;p=openldap

Another BDB_HIER redundant modification
---

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index 35101c2bb4..f05980beb3 100644
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -600,7 +600,9 @@ again:		ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock );
 				if ( rc ) {
 					bdb_cache_entry_db_relock( bdb->bi_dbenv,
 						locker, *eip, 1, 0, lock );
-					rc = bdb_fix_dn( (*eip)->bei_e, 2 );
+					/* check again in case other modifier did it already */
+					if ( bdb_fix_dn( (*eip)->bei_e, 1 ) )
+						rc = bdb_fix_dn( (*eip)->bei_e, 2 );
 					bdb_cache_entry_db_relock( bdb->bi_dbenv,
 						locker, *eip, 0, 0, lock );
 				}