Enable features that were hidden behind LDAP_DEVEL

[openldap] / servers / slapd / overlays / pcache.c

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 08a0866d3b7decbe6b2c0af3bb37e8e76eda7fa0..8356e49bc332a5ec3df75a7182bf2be36b4ac305 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -37,7 +37,6 @@
 
 #include "config.h"
 
-#ifdef LDAP_DEVEL
 /*
  * Control that allows to access the private DB
  * instead of the public one
@@ -53,7 +52,6 @@
  * Monitoring
  */
 #define PCACHE_MONITOR
-#endif
 
 /* query cache structs */
 /* query */
@@ -2438,6 +2436,7 @@ pcache_response(
 
        if ( si->swap_saved_attrs ) {
                rs->sr_attrs = si->save_attrs;
+               rs->sr_attr_flags = slap_attr_flags( si->save_attrs );
                op->ors_attrs = si->save_attrs;
        }
 
@@ -3210,6 +3209,10 @@ get_attr_set(
                int found = 1;
 
                if ( count > qm->attr_sets[i].count ) {
+                       if ( qm->attr_sets[i].count &&
+                               bvmatch( &qm->attr_sets[i].attrs[0].an_name, slap_bv_all_user_attrs )) {
+                               break;
+                       }
                        continue;
                }