minor cleanup

[openldap] / servers / slapd / back-meta / search.c

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index fb0c813c6068c4506b716f5d3bf5d33fb5f58673..b64c92d9359d65df27ddd6247ccae79e97af2397 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -102,11 +102,9 @@ meta_back_search_start(
                                        &op->o_req_ndn ) )
                        {
                                realbase = mi->mi_targets[ candidate ].mt_nsuffix;
-#ifdef LDAP_SCOPE_SUBORDINATE
                                if ( mi->mi_targets[ candidate ].mt_scope == LDAP_SCOPE_SUBORDINATE ) {
                                        realscope = LDAP_SCOPE_SUBORDINATE;
                                }
-#endif /* LDAP_SCOPE_SUBORDINATE */
 
                        } else {
                                /*
@@ -116,9 +114,7 @@ meta_back_search_start(
                        }
                        break;
 
-#ifdef LDAP_SCOPE_SUBORDINATE
                case LDAP_SCOPE_SUBORDINATE:
-#endif /* LDAP_SCOPE_SUBORDINATE */
                case LDAP_SCOPE_ONELEVEL:
                {
                        struct berval   rdn = mi->mi_targets[ candidate ].mt_nsuffix;
@@ -132,16 +128,13 @@ meta_back_search_start(
                                 * base, and make scope "base"
                                 */
                                realbase = mi->mi_targets[ candidate ].mt_nsuffix;
-#ifdef LDAP_SCOPE_SUBORDINATE
                                if ( op->ors_scope == LDAP_SCOPE_SUBORDINATE ) {
                                        if ( mi->mi_targets[ candidate ].mt_scope == LDAP_SCOPE_SUBORDINATE ) {
                                                realscope = LDAP_SCOPE_SUBORDINATE;
                                        } else {
                                                realscope = LDAP_SCOPE_SUBTREE;
                                        }
-                               } else
-#endif /* LDAP_SCOPE_SUBORDINATE */
-                               {
+                               } else {
                                        realscope = LDAP_SCOPE_BASE;
                                }
                                break;
@@ -451,29 +444,30 @@ really_bad:;
                                        candidates[ i ].sr_type = REP_RESULT;
                                }
 
-                               if ( --op->ors_slimit == -1 ) {
-                                       ldap_msgfree( res );
-                                       res = NULL;
+                               is_ok++;
 
-                                       rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
+                               e = ldap_first_entry( msc->msc_ld, res );
+                               savepriv = op->o_private;
+                               op->o_private = (void *)i;
+                               rs->sr_err = meta_send_entry( op, rs, mc, i, e );
+                               ldap_msgfree( res );
+                               res = NULL;
+
+                               switch ( rs->sr_err ) {
+                               case LDAP_SIZELIMIT_EXCEEDED:
                                        savepriv = op->o_private;
                                        op->o_private = (void *)i;
                                        send_ldap_result( op, rs );
                                        op->o_private = savepriv;
+                                       rs->sr_err = LDAP_SUCCESS;
                                        goto finish;
-                               }
-
-                               is_ok++;
 
-                               e = ldap_first_entry( msc->msc_ld, res );
-                               savepriv = op->o_private;
-                               op->o_private = (void *)i;
-                               meta_send_entry( op, rs, mc, i, e );
+                               case LDAP_UNAVAILABLE:
+                                       rs->sr_err = LDAP_OTHER;
+                                       goto finish;
+                               }
                                op->o_private = savepriv;
 
-                               ldap_msgfree( res );
-                               res = NULL;
-
                                gotit = 1;
 
 #if 0
@@ -572,13 +566,22 @@ really_bad:;
                                        candidates[ i ].sr_type = REP_RESULT;
                                }
 
+                               /* NOTE: ignores response controls
+                                * (and intermediate response controls
+                                * as well, except for those with search
+                                * references); this may not be correct,
+                                * but if they're not ignored then
+                                * back-meta would need to merge them
+                                * consistently (think of pagedResults...)
+                                */
                                if ( ldap_parse_result( msc->msc_ld,
                                                        res,
                                                        &candidates[ i ].sr_err,
                                                        (char **)&candidates[ i ].sr_matched,
                                                        NULL /* (char **)&candidates[ i ].sr_text */ ,
                                                        &references,
-                                                       &candidates[ i ].sr_ctrls, 1 ) != LDAP_SUCCESS )
+                                                       NULL /* &candidates[ i ].sr_ctrls (unused) */ ,
+                                                       1 ) != LDAP_SUCCESS )
                                {
                                        res = NULL;
                                        ldap_get_option( msc->msc_ld,
@@ -607,10 +610,10 @@ really_bad:;
 
                                                ber_str2bv( candidates[ i ].sr_matched,
                                                        0, 0, &match );
+                                               candidates[ i ].sr_matched = NULL;
 
                                                dc.ctx = "matchedDN";
                                                dc.target = &mi->mi_targets[ i ];
-
                                                if ( !ldap_back_dn_massage( &dc, &match, &mmatch ) ) {
                                                        if ( mmatch.bv_val == match.bv_val ) {
                                                                candidates[ i ].sr_matched = ch_strdup( mmatch.bv_val );
@@ -771,11 +774,24 @@ really_bad:;
                /* we use the first one */
                for ( i = 0; i < mi->mi_ntargets; i++ ) {
                        if ( candidates[ i ].sr_tag == META_CANDIDATE
-                                       && candidates[ i ].sr_matched )
+                                       && candidates[ i ].sr_matched != NULL )
                        {
                                struct berval   bv, pbv;
                                int             rc;
 
+                               /* if we got success, and this target
+                                * returned noSuchObject, and its suffix
+                                * is a superior of the searchBase,
+                                * ignore the matchedDN */
+                               if ( sres == LDAP_SUCCESS
+                                       && candidates[ i ].sr_err == LDAP_NO_SUCH_OBJECT
+                                       && op->o_req_ndn.bv_len > mi->mi_targets[ i ].mt_nsuffix.bv_len )
+                               {
+                                       free( (char *)candidates[ i ].sr_matched );
+                                       candidates[ i ].sr_matched = NULL;
+                                       continue;
+                               }
+
                                ber_str2bv( candidates[ i ].sr_matched, 0, 0, &bv );
                                rc = dnPretty( NULL, &bv, &pbv, op->o_tmpmemctx );
 
@@ -1142,7 +1158,12 @@ next_attr:;
        rs->sr_entry = &ent;
        rs->sr_attrs = op->ors_attrs;
        rs->sr_flags = 0;
-       send_search_entry( op, rs );
+       rc = send_search_entry( op, rs );
+       switch ( rc ) {
+       case LDAP_UNAVAILABLE:
+               rc = LDAP_OTHER;
+               break;
+       }
        rs->sr_entry = NULL;
        rs->sr_attrs = NULL;
        
@@ -1156,6 +1177,6 @@ next_attr:;
        }
        entry_clean( &ent );
 
-       return LDAP_SUCCESS;
+       return rc;
 }