better fix to ITS#4183 (the prototype in proto-slap.h was erroneously committed earlier)

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

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 6cfc9e7c1df1c8979f3b68f85ee06838fc6ffe27..47e7886ee1a945c131ec298c6c3fd7f866b90fb2 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -39,8 +39,7 @@ ldbm_back_search(
     SlapReply  *rs )
 {
        struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
-       int             rc, err;
-       const char *text = NULL;
+       int             rc;
        time_t          stoptime;
        ID_BLOCK                *candidates;
        ID              id, cursor;
@@ -48,6 +47,9 @@ ldbm_back_search(
        Entry   *matched = NULL;
        struct berval   realbase = BER_BVNULL;
        int             manageDSAit = get_manageDSAit( op );
+#ifdef SLAP_ACL_HONOR_DISCLOSE
+       slap_mask_t     mask;
+#endif
 
        Debug(LDAP_DEBUG_TRACE, "=> ldbm_back_search\n", 0, 0, 0);
 
@@ -85,16 +87,28 @@ ldbm_back_search(
                struct berval matched_dn = BER_BVNULL;
 
                if ( matched != NULL ) {
-                       BerVarray erefs;
-                       ber_dupbv( &matched_dn, &matched->e_name );
+                       BerVarray erefs = NULL;
+
+#ifdef SLAP_ACL_HONOR_DISCLOSE
+                       if ( ! access_allowed( op, matched,
+                                               slap_schema.si_ad_entry,
+                                               NULL, ACL_DISCLOSE, NULL ) )
+                       {
+                               rs->sr_err = LDAP_NO_SUCH_OBJECT;
+
+                       } else
+#endif /* SLAP_ACL_HONOR_DISCLOSE */
+                       {
+                               ber_dupbv( &matched_dn, &matched->e_name );
 
-                       erefs = is_entry_referral( matched )
-                               ? get_entry_referrals( op, matched )
-                               : NULL;
+                               erefs = is_entry_referral( matched )
+                                       ? get_entry_referrals( op, matched )
+                                       : NULL;
+                       }
 
                        cache_return_entry_r( &li->li_cache, matched );
 
-                       if( erefs ) {
+                       if ( erefs ) {
                                rs->sr_ref = referral_rewrite( erefs, &matched_dn,
                                        &op->o_req_dn, op->ors_scope );
 
@@ -115,17 +129,40 @@ ldbm_back_search(
                ber_memfree( matched_dn.bv_val );
                rs->sr_ref = NULL;
                rs->sr_matched = NULL;
-               return LDAP_REFERRAL;
+               return rs->sr_err;
+       }
+
+#ifdef SLAP_ACL_HONOR_DISCLOSE
+       /* NOTE: __NEW__ "search" access is required
+        * on searchBase object */
+       if ( ! access_allowed_mask( op, e, slap_schema.si_ad_entry,
+                               NULL, ACL_SEARCH, NULL, &mask ) )
+       {
+               if ( !ACL_GRANT( mask, ACL_DISCLOSE ) ) {
+                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+               } else {
+                       rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+               }
+
+               cache_return_entry_r( &li->li_cache, e );
+               ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
+
+               send_ldap_result( op, rs );
+               return rs->sr_err;
        }
+#endif /* SLAP_ACL_HONOR_DISCLOSE */
 
-       if (!manageDSAit && is_entry_referral( e ) ) {
+       if ( !manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow add */
-               struct berval matched_dn;
-               BerVarray erefs;
+               struct berval   matched_dn = BER_BVNULL;
+               BerVarray       erefs = NULL;
+
+               rs->sr_ref = NULL;
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "bad referral object";
 
                ber_dupbv( &matched_dn, &e->e_name );
                erefs = get_entry_referrals( op, e );
-               rs->sr_ref = NULL;
 
                cache_return_entry_r( &li->li_cache, e );
                ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
@@ -134,28 +171,25 @@ ldbm_back_search(
                        "ldbm_search: entry is referral\n",
                        0, 0, 0 );
 
-               if( erefs ) {
+               if ( erefs ) {
                        rs->sr_ref = referral_rewrite( erefs, &matched_dn,
                                &op->o_req_dn, op->ors_scope );
 
                        ber_bvarray_free( erefs );
+                       
+                       if ( rs->sr_ref ) {
+                               rs->sr_err = LDAP_REFERRAL;
+                               rs->sr_text = NULL;
+                       }
                }
 
                rs->sr_matched = matched_dn.bv_val;
-               if( rs->sr_ref ) {
-                       rs->sr_err = LDAP_REFERRAL;
-                       send_ldap_result( op, rs );
-                       ber_bvarray_free( rs->sr_ref );
-
-               } else {
-                       send_ldap_error( op, rs, LDAP_OTHER,
-                       "bad referral object" );
-               }
-
+               send_ldap_result( op, rs );
+               ber_bvarray_free( rs->sr_ref );
                ber_memfree( matched_dn.bv_val );
                rs->sr_ref = NULL;
                rs->sr_matched = NULL;
-               return LDAP_OTHER;
+               return rs->sr_err;
        }
 
        if ( is_entry_alias( e ) ) {
@@ -211,7 +245,7 @@ searchit:
 
                /* check for abandon */
                if ( op->o_abandon ) {
-                       rc = LDAP_SUCCESS;
+                       rc = SLAPD_ABANDON;
                        goto done;
                }
 
@@ -343,6 +377,8 @@ searchit:
                                                ? LDAP_SCOPE_BASE
                                                : LDAP_SCOPE_SUBTREE );
 
+                               ber_bvarray_free( erefs );
+
                                send_search_reference( op, rs );
 
                                ber_bvarray_free( rs->sr_ref );