From 033cf4ebe77d902c707be2f36f3c03367ab3c485 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 26 Oct 1998 17:37:35 +0000 Subject: [PATCH] Fixup bugs created by merge. --- servers/slapd/back-ldbm/group.c | 2 +- servers/slapd/back-ldbm/search.c | 7 ++++--- servers/slapd/main.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c index 536a48dd6b..5cbebd1b0e 100644 --- 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 5f0cf3a6fb..2ec7b0902b 100644 --- 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 bb4c286703..95bdf71301 100644 --- 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( ¤ttime_mutex ); -- 2.39.5