From d631a3fdecc737cb0818d815e47f28d304b38f12 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 16 Jul 1999 01:52:06 +0000
Subject: [PATCH] Fix comments and entry lock leak.

---
 servers/slapd/back-ldbm/bind.c   | 3 +--
 servers/slapd/back-ldbm/dn2id.c  | 4 ++--
 servers/slapd/back-ldbm/group.c  | 4 ++--
 servers/slapd/back-ldbm/search.c | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 34f10812a4..dad6b9e2ac 100644
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -167,8 +167,7 @@ ldbm_back_bind(
 	}
 
 	if ( is_entry_referral( e ) ) {
-		/* parent is a referral, don't allow add */
-		/* parent is an alias, don't allow add */
+		/* entry is a referral, don't allow bind */
 		struct berval **refs = get_entry_referrals( be,
 			conn, op, e );
 
diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 387ad2fff6..c361418e3c 100644
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -169,7 +169,7 @@ dn2entry_rw(
 		rw ? "w" : "r", dn, 0);
 
 	if( matched != NULL ) {
-		/* caller care about match */
+		/* caller cares about match */
 		*matched = NULL;
 	}
 
@@ -191,7 +191,7 @@ dn2entry_rw(
 	if( matched == NULL ) return NULL;
 
 	/* entry does not exist - see how much of the dn does exist */
-	/* dn_parent checks runs NULL if dn is suffix */
+	/* dn_parent checks returns NULL if dn is suffix */
 	if ( (pdn = dn_parent( be, dn )) != NULL ) {
 		/* get entry with reader lock */
 		if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index aee659e83f..c890cc49e1 100644
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -118,8 +118,8 @@ ldbm_back_group(
 	}
 
 	Debug( LDAP_DEBUG_ACL,
-		"<= ldbm_back_group: found objectClass and %s\n",
-		groupattrName, 0, 0 ); 
+		"<= ldbm_back_group: found objectClass %s and %s\n",
+		objectclassValue, groupattrName, 0 ); 
 
 	bv.bv_val = op_ndn;
 	bv.bv_len = strlen( op_ndn );         
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 35dfabd0d8..dbbf761487 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -144,6 +144,7 @@ ldbm_back_search(
 			NULL, NULL, NULL, NULL, 0 );
 
 		rc = 1;
+		goto done;
 	}
 
 	for ( id = idl_firstid( candidates ); id != NOID;
-- 
2.39.5