From: Howard Chu <hyc@openldap.org>
Date: Wed, 25 Aug 2004 13:55:55 +0000 (+0000)
Subject: ITS#3301 check for dn2entry failure
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~643
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5cba21700675d1e356003b15049329acb7082465;p=openldap

ITS#3301 check for dn2entry failure
---

diff --git a/servers/slapd/back-bdb/ctxcsn.c b/servers/slapd/back-bdb/ctxcsn.c
index 7c2b31ec36..817afc98a5 100644
--- a/servers/slapd/back-bdb/ctxcsn.c
+++ b/servers/slapd/back-bdb/ctxcsn.c
@@ -58,6 +58,15 @@ bdb_csn_commit(
 
 	rc =  bdb_dn2entry( op, tid, &op->o_bd->be_context_csn, &ctxcsn_ei,
 			1, locker, &ctxcsn_lock );
+	switch( rc ) {
+	case 0:
+		break;
+	case DB_LOCK_DEADLOCK:
+	case DB_LOCK_NOTGRANTED:
+		return BDB_CSN_RETRY;
+	default:
+		return BDB_CSN_ABORT;
+	}
 	
 	*ctxcsn_e = ctxcsn_ei->bei_e;