From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 10 Jul 2004 15:15:01 +0000 (+0000)
Subject: fix previous commit (needs work)
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~91
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7679f37b1de5eb50dc482cc96f42980353797085;p=openldap

fix previous commit (needs work)
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index da40810e00..2238e4eec8 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -1877,7 +1877,35 @@ proxy_cache_open(
 		return rc;
 	}
 
+	/* FIXME: this is a duplication of code that is present
+	 * in backend_startup(); however, backend_startup() can
+	 * be called only once, and it is already called by slapd
+	 * for all backends and databases, while the proxy cache
+	 * database does not exist until the overlay is started,
+	 * and back-bdb/back-hdb need the be_context_csn field.
+	 */
+#if 0
 	rc = backend_startup( &cm->db );
+#endif
+
+	/* startup a specific backend database */
+	cm->db.be_pending_csn_list = (struct be_pcl *)
+		ch_calloc( 1, sizeof( struct be_pcl ));
+	build_new_dn( &cm->db.be_context_csn, cm->db.be_nsuffix,
+		(struct berval *)&slap_ldapsync_cn_bv, NULL );
+
+	LDAP_TAILQ_INIT( cm->db.be_pending_csn_list );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACKEND, DETAIL1, "proxy_cache_open:  starting \"%s\"\n",
+		cm->db.be_suffix ? cm->db.be_suffix[0].bv_val : "(unknown)",
+		0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE,
+		"proxy_cache_open: starting \"%s\"\n",
+		cm->db.be_suffix ? cm->db.be_suffix[0].bv_val : "(unknown)",
+		0, 0 );
+#endif
 
 	if ( rc != 0 ) {
 		return rc;