Revert prev commit (ITS#5367)

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

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index ecdd2546ae3cffe8ce350e5664d579480ba3c9f9..450706c12751e13454798016afecc6057b54fb95 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-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2008 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * Portions Copyright 2003 Symas Corporation.
  * All rights reserved.
@@ -2015,6 +2015,9 @@ pcache_op_cleanup( Operation *op, SlapReply *rs ) {
                                case PC_SIZELIMIT:
                                        qc->q_sizelimit = rs->sr_nentries;
                                        break;
+                               default:
+                                       assert( 0 );
+                                       break;
                                }
                                ldap_pvt_thread_rdwr_wunlock(&qc->rwlock);
                                ldap_pvt_thread_mutex_lock(&cm->cache_mutex);
@@ -2660,7 +2663,7 @@ static int pcache_db_open2( slap_overinst *on, ConfigReply *cr );
 static int
 pc_ldadd_cleanup( ConfigArgs *c )
 {
-       slap_overinst *on = c->private;
+       slap_overinst *on = c->ca_private;
        return pcache_db_open2( on, &c->reply );
 }
 
@@ -2682,7 +2685,7 @@ pc_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
                ca->cleanup = pc_ldadd_cleanup;
        else
                cm->defer_db_open = 0;
-       ca->private = on;
+       ca->ca_private = on;
        return LDAP_SUCCESS;
 }