Fix comments and entry lock leak.

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 34f10812a49f44c8ca5e88e2b0f5bfa2624890f8..dad6b9e2ac7127bc02a2b481863ad827c031cdbf 100644 (file)
--- 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 387ad2fff6a877e392d70483f08bd8279bfca414..c361418e3c7f12cd6ae55a444e1cbb6d5578fcef 100644 (file)
--- 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 aee659e83fef17ff89d1ffe96e53444228f767bb..c890cc49e169b918f6bc91f37f638dec90571a3c 100644 (file)
--- 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 35dfabd0d8894e2fccfe3b7466af8a4cae9e73cf..dbbf761487bcf9632cccc1cd43fdc61d7052e3c7 100644 (file)
--- 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;