From: Howard Chu <hyc@openldap.org>
Date: Wed, 12 Mar 2003 21:16:43 +0000 (+0000)
Subject: Fix error messages
X-Git-Tag: NO_SLAP_OP_BLOCKS~129
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2223ede5be37876174f87db81f58959cbc4451f;p=openldap

Fix error messages
---

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 079b44081c..6d8273ba27 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -385,7 +385,7 @@ retry:	/* transaction retry */
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		default:
-			rc = LDAP_OTHER;
+			;
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG ( OPERATION, ERR, 
@@ -396,6 +396,7 @@ retry:	/* transaction retry */
 			db_strerror(rc), rc, 0 );
 #endif
 		text = "DN index delete failed";
+		rc = LDAP_OTHER;
 		goto return_results;
 	}
 
@@ -407,7 +408,7 @@ retry:	/* transaction retry */
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		default:
-			rc = LDAP_OTHER;
+			;
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG ( OPERATION, ERR, 
@@ -419,6 +420,7 @@ retry:	/* transaction retry */
 			db_strerror(rc), rc, 0 );
 #endif
 		text = "entry delete failed";
+		rc = LDAP_OTHER;
 		goto return_results;
 	}
 
@@ -430,7 +432,7 @@ retry:	/* transaction retry */
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		default:
-			rc = LDAP_OTHER;
+			;
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG ( OPERATION, ERR, 
@@ -440,6 +442,7 @@ retry:	/* transaction retry */
 			0, 0, 0 );
 #endif
 		text = "entry index delete failed";
+		rc = LDAP_OTHER;
 		goto return_results;
 	}