Fixup bugs created by merge.

diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index 536a48dd6b2a21e848ebf3845b71a2f8e5912bd2..5cbebd1b0eb910af33c91e5ed292e6c22821dd8b 100644 (file)
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -75,7 +75,7 @@ ldbm_back_group(
                                        "<= ldbm_back_group: failed to find objectClass in groupOfNames\n", 
                         0, 0, 0 ); 
             }
-            else if (value_find(Member->a_vals, &bvMembers, SYNTAX_CIS, 1) != 0) {
+            else if (value_find(member->a_vals, &bvMembers, SYNTAX_CIS, 1) != 0) {
                 Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: %s not in %s: groupOfNames\n", 
                         edn, bdn, 0 ); 
             }

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 5f0cf3a6fb1724c438fd7bb96b59314d0c365656..2ec7b0902bc6e579255ed698ecabd7d1e6c04649 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -172,8 +172,9 @@ ldbm_back_search(
                 * this for subtree searches, and don't check the filter explicitly
                 * here since it's only a candidate anyway.
                 */
-               if ( e->e_dn != NULL && strncasecmp( e->e_dn, "ref=", 4 )
-                       == 0 && (ref = attr_find( e->e_attrs, "ref" )) != NULL &&
+               if ( e->e_dn != NULL &&
+                       strncasecmp( e->e_dn, "ref=", 4 ) == 0 &&
+                       (ref = attr_find( e->e_attrs, "ref" )) != NULL &&
                        scope == LDAP_SCOPE_SUBTREE )
                {
                        int     i, len;
@@ -262,7 +263,7 @@ ldbm_back_search(
                        }
                }
 
-               if( e == NULL ) {
+               if( e != NULL ) {
                        /* free reader lock */
                        cache_return_entry_r( &li->li_cache, e );
                }

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index bb4c286703c6641bf3e66869a99b28fd03756978..95bdf7130149aa0f11776e91d02877cde6d9ebf6 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -251,7 +251,8 @@ main( argc, argv )
                            0, 0, 0 );
                }
 
-               ber_init( &ber, 0 );
+               ber_init_w_nullc( &ber, 0 );
+
                while ( (tag = ber_get_next( &c.c_sb, &len, &ber ))
                    == LDAP_TAG_MESSAGE ) {
                        pthread_mutex_lock( &currenttime_mutex );