Commit 033cf4eb authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Fixup bugs created by merge.

parent d81b77e5
......@@ -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 );
}
......
......@@ -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 );
}
......
......@@ -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 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment