fix wrong response tags (ITS4182; consequence of fixing ITS#4173)

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

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 0e1349a18144209a21e60bde5797256144b66cce..b34ab149ad97213a2a029a498dc1e5e592530452 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -186,7 +186,7 @@ merge_entry(
                        op->o_tag = LDAP_REQ_MODIFY;
                        op->orm_modlist = modlist;
                        op->o_bd->be_modify( op, &sreply );
-                       slap_mods_free( modlist );
+                       slap_mods_free( modlist, 1 );
                } else if ( rc == LDAP_REFERRAL ||
                                        rc == LDAP_NO_SUCH_OBJECT ) {
                        syncrepl_add_glue( op, e );
@@ -854,6 +854,7 @@ remove_query_data (
                        vals[1].bv_val = NULL;
                        vals[1].bv_len = 0;
                        mod.sml_op = LDAP_MOD_DELETE;
+                       mod.sml_flags = 0;
                        mod.sml_desc = ad_queryid;
                        mod.sml_type = ad_queryid->ad_cname;
                        mod.sml_values = vals;
@@ -1204,6 +1205,42 @@ add_filter_attrs(
        }
 }
 
+/* NOTE: this is a quick workaround to let pcache minimally interact
+ * with pagedResults.  A more articulated solutions would be to
+ * perform the remote query without control and cache all results,
+ * performing the pagedResults search only within the client
+ * and the proxy.  This requires pcache to understand pagedResults. */
+static int
+proxy_cache_chk_controls(
+       Operation       *op,
+       SlapReply       *rs )
+{
+       const char      *non = "";
+       const char      *stripped = "";
+
+       switch( op->o_pagedresults ) {
+       case SLAP_CONTROL_NONCRITICAL:
+               non = "non-";
+               stripped = "; stripped";
+               /* fallthru */
+
+       case SLAP_CONTROL_CRITICAL:
+               Debug( LDAP_DEBUG_ANY, "%s: "
+                       "%scritical pagedResults control "
+                       "disabled with proxy cache%s.\n",
+                       op->o_log_prefix, non, stripped );
+               
+               slap_remove_control( op, rs, slap_cids.sc_pagedResults, NULL );
+               break;
+
+       default:
+               rs->sr_err = SLAP_CB_CONTINUE;
+               break;
+       }
+
+       return rs->sr_err;
+}
+
 static int
 proxy_cache_search(
        Operation       *op,
@@ -1240,6 +1277,9 @@ proxy_cache_search(
        Debug( LDAP_DEBUG_ANY, "query template of incoming query = %s\n",
                                        tempstr.bv_val, 0, 0 );
 
+       /* FIXME: cannot cache/answer requests with pagedResults control */
+       
+
        /* find attr set */
        attr_set = get_attr_set(op->ors_attrs, qm, cm->numattrsets);
 
@@ -1422,7 +1462,7 @@ consistency_check(
        cache_manager *cm = on->on_bi.bi_private;
        query_manager *qm = cm->qm;
        Connection conn = {0};
-       char opbuf[OPERATION_BUFFER_SIZE];
+       OperationBuffer opbuf;
        Operation *op;
 
        SlapReply rs = {REP_RESULT};
@@ -1430,7 +1470,7 @@ consistency_check(
        int i, return_val, pause = 1;
        QueryTemplate* templ;
 
-       op = (Operation *)opbuf;
+       op = (Operation *) &opbuf;
        connection_fake_init( &conn, op, ctx );
 
        op->o_bd = &cm->db;
@@ -1608,7 +1648,7 @@ static ConfigTable pccfg[] = {
                        "DESC 'Filter template, attrset, and cache TTL' "
                        "SYNTAX OMsDirectoryString )", NULL, NULL },
        { "response-callback", "head|tail(default)",
-               2, 2, 0, ARG_MAGIC|ARG_STRING|PC_RESP, pc_cf_gen,
+               2, 2, 0, ARG_MAGIC|PC_RESP, pc_cf_gen,
                "( OLcfgOvAt:2.4 NAME 'olcProxyResponseCB' "
                        "DESC 'Response callback position in overlay stack' "
                        "SYNTAX OMsDirectoryString )", NULL, NULL },
@@ -1715,7 +1755,7 @@ pc_cf_gen( ConfigArgs *c )
                        break;
                case PC_TEMP:
                        for (i=0; i<cm->numtemplates; i++) {
-                               bv.bv_len = sprintf( c->msg, " %d %d",
+                               bv.bv_len = sprintf( c->msg, " %d %ld",
                                        qm->templates[i].attr_set_index,
                                        qm->templates[i].ttl );
                                bv.bv_len += qm->templates[i].querystr.bv_len + 2;
@@ -1732,11 +1772,9 @@ pc_cf_gen( ConfigArgs *c )
                        break;
                case PC_RESP:
                        if ( cm->response_cb == PCACHE_RESPONSE_CB_HEAD ) {
-                               bv.bv_val = "head";
-                               bv.bv_len = STRLENOF("head");
+                               BER_BVSTR( &bv, "head" );
                        } else {
-                               bv.bv_val = "tail";
-                               bv.bv_len = STRLENOF("tail");
+                               BER_BVSTR( &bv, "tail" );
                        }
                        value_add_one( &c->rvalue_vals, &bv );
                        break;
@@ -1761,21 +1799,11 @@ pc_cf_gen( ConfigArgs *c )
                        Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
                        return( 1 );
                }
-               cm->db.bd_info = backend_info( c->argv[1] );
-               if ( !cm->db.bd_info ) {
+               if ( !backend_db_init( c->argv[1], &cm->db )) {
                        sprintf( c->msg, "unknown backend type" );
                        Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
                        return( 1 );
                }
-               if ( cm->db.bd_info->bi_db_init( &cm->db ) ) {
-                       sprintf( c->msg, "backend %s init failed", c->argv[1] );
-                       Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
-                       return( 1 );
-               }
-
-               /* This type is in use, needs to be opened */
-               cm->db.bd_info->bi_nDB++;
-
                cm->max_entries = atoi( c->argv[2] );
 
                cm->num_entries_limit = atoi( c->argv[4] );
@@ -2025,17 +2053,24 @@ proxy_cache_destroy(
        slap_overinst *on = (slap_overinst *)be->bd_info;
        cache_manager *cm = on->on_bi.bi_private;
        query_manager *qm = cm->qm;
-       int rc = 0;
 
-       if ( cm->db.bd_info->bi_db_destroy ) {
-               rc = cm->db.bd_info->bi_db_destroy( &cm->db );
-       }
-       ldap_pvt_thread_mutex_destroy(&qm->lru_mutex);
-       ldap_pvt_thread_mutex_destroy(&cm->cache_mutex);
-       ldap_pvt_thread_mutex_destroy(&cm->remove_mutex);
+       /* cleanup stuff inherited from the original database... */
+       cm->db.be_suffix = NULL;
+       cm->db.be_nsuffix = NULL;
+       BER_BVZERO( &cm->db.be_rootdn );
+       BER_BVZERO( &cm->db.be_rootndn );
+       BER_BVZERO( &cm->db.be_rootpw );
+       /* FIXME: there might be more... */
+
+       backend_destroy_one( &cm->db, 0 );
+
+       ldap_pvt_thread_mutex_destroy( &qm->lru_mutex );
+       ldap_pvt_thread_mutex_destroy( &cm->cache_mutex );
+       ldap_pvt_thread_mutex_destroy( &cm->remove_mutex );
        free( qm );
        free( cm );
-       return rc;
+
+       return 0;
 }
 
 static slap_overinst proxy_cache;
@@ -2074,6 +2109,8 @@ int pcache_init()
        proxy_cache.on_bi.bi_db_destroy = proxy_cache_destroy;
        proxy_cache.on_bi.bi_op_search = proxy_cache_search;
 
+       proxy_cache.on_bi.bi_chk_controls = proxy_cache_chk_controls;
+
        proxy_cache.on_bi.bi_cf_ocs = pcocs;
 
        code = config_register_schema( pccfg, pcocs );