Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 8788378a3033440c930e7fbe70bf2e384b9b7a83..6971694282bcf848b42882deb94b1a581245157c 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2011 The OpenLDAP Foundation.
+ * Copyright 2003-2012 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * Portions Copyright 2003-2009 Symas Corporation.
  * All rights reserved.
@@ -3418,6 +3418,7 @@ refresh_query( Operation *op, CachedQuery *query, slap_overinst *on )
        op->o_req_dn = query->qbase->base;
        op->o_req_ndn = query->qbase->base;
        op->ors_scope = query->scope;
+       op->ors_deref = LDAP_DEREF_NEVER;
        op->ors_slimit = SLAP_NO_LIMIT;
        op->ors_tlimit = SLAP_NO_LIMIT;
        op->ors_limit = NULL;
@@ -5519,7 +5520,6 @@ pcache_monitor_db_open( BackendDB *be )
        int                     rc = 0;
        BackendInfo             *mi;
        monitor_extra_t         *mbe;
-       struct berval           dummy = BER_BVC( "" );
 
        if ( !SLAP_DBMONITORING( be ) ) {
                return 0;
@@ -5579,7 +5579,7 @@ pcache_monitor_db_open( BackendDB *be )
        rc = mbe->register_overlay( be, on, &cm->monitor_ndn );
        if ( rc == 0 ) {
                rc = mbe->register_entry_attrs( &cm->monitor_ndn, a, cb,
-                       &dummy, -1, &dummy);
+                       NULL, -1, NULL);
        }
 
 cleanup:;