ITS#4225 added proxyCacheQueries parameter for configuring max_queries

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

diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index 7120b1f69ba3c2a6cded1c2e7877d94296dc7ddd..c87907462c32fc356d8f69c5833ff7db4446e2b6 100644 (file)
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2005 The OpenLDAP Foundation.
+ * Copyright 2004-2006 The OpenLDAP Foundation.
  * Portions Copyright 2004 Symas Corporation.
  * All rights reserved.
  *
@@ -301,7 +301,8 @@ static char *build_filter(
        unique_data *ud,
        AttributeDescription *ad,
        BerVarray b,
-       char *kp
+       char *kp,
+       void *ctx
 )
 {
        unique_attrs *up;
@@ -332,9 +333,11 @@ static char *build_filter(
                        for ( i = 0; b[i].bv_val; i++ ) {
                                struct berval   bv;
 
-                               ldap_bv2escaped_filter_value( &b[i], &bv );
+                               ldap_bv2escaped_filter_value_x( &b[i], &bv, 1, ctx );
                                kp += sprintf( kp, "(%s=%s)", ad->ad_cname.bv_val, bv.bv_val );
-                               ldap_memfree( bv.bv_val );
+                               if ( bv.bv_val != b[i].bv_val ) {
+                                       ber_memfree_x( bv.bv_val, ctx );
+                               }
                        }
                } else if ( ud->strict ) {
                        kp += sprintf( kp, "(%s=*)", ad->ad_cname.bv_val );
@@ -381,7 +384,7 @@ static int unique_search(
        nop->o_bd = on->on_info->oi_origdb;
        rc = nop->o_bd->be_search(nop, &nrs);
        filter_free_x(nop, nop->ors_filter);
-       ch_free( key );
+       op->o_tmpfree( key, op->o_tmpmemctx );
 
        if(rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT) {
                op->o_bd->bd_info = (BackendInfo *) on->on_info;
@@ -401,6 +404,8 @@ static int unique_search(
        return(SLAP_CB_CONTINUE);
 }
 
+#define ALLOC_EXTRA    16      /* extra slop */
+
 static int unique_add(
        Operation *op,
        SlapReply *rs
@@ -412,7 +417,7 @@ static int unique_add(
 
        Attribute *a;
        char *key, *kp;
-       int ks = 16;
+       int ks = 0;
 
        Debug(LDAP_DEBUG_TRACE, "==> unique_add <%s>\n", op->o_req_dn.bv_val, 0, 0);
 
@@ -435,12 +440,16 @@ static int unique_add(
                ks = count_filter_len(ud, a->a_desc, a->a_vals, ks);
        }
 
-       key = ch_malloc(ks);
+       if ( !ks )
+               return SLAP_CB_CONTINUE;
+
+       ks += ALLOC_EXTRA;
+       key = op->o_tmpalloc(ks, op->o_tmpmemctx);
 
        kp = key + sprintf(key, "(|");
 
        for(a = op->ora_e->e_attrs; a; a = a->a_next) {
-               kp = build_filter(ud, a->a_desc, a->a_vals, kp);
+               kp = build_filter(ud, a->a_desc, a->a_vals, kp, op->o_tmpmemctx);
        }
 
        sprintf(kp, ")");
@@ -462,7 +471,7 @@ static int unique_modify(
 
        Modifications *m;
        char *key, *kp;
-       int ks = 16;            /* a handful of extra bytes */
+       int ks = 0;
 
        Debug(LDAP_DEBUG_TRACE, "==> unique_modify <%s>\n", op->o_req_dn.bv_val, 0, 0);
 
@@ -486,13 +495,17 @@ static int unique_modify(
                ks = count_filter_len(ud, m->sml_desc, m->sml_values, ks);
        }
 
-       key = ch_malloc(ks);
+       if ( !ks )
+               return SLAP_CB_CONTINUE;
+
+       ks += ALLOC_EXTRA;
+       key = op->o_tmpalloc(ks, op->o_tmpmemctx);
 
        kp = key + sprintf(key, "(|");
 
        for(m = op->orm_modlist; m; m = m->sml_next) {
                if ((m->sml_op & LDAP_MOD_OP) == LDAP_MOD_DELETE) continue;
-               kp = build_filter(ud, m->sml_desc, m->sml_values, kp);
+               kp = build_filter(ud, m->sml_desc, m->sml_values, kp, op->o_tmpmemctx);
        }
 
        sprintf(kp, ")");
@@ -513,7 +526,7 @@ static int unique_modrdn(
        Operation nop = *op;
 
        char *key, *kp;
-       int i, ks = 16;                 /* a handful of extra bytes */
+       int i, ks = 0;
        LDAPRDN newrdn;
        struct berval bv[2];
 
@@ -550,12 +563,16 @@ static int unique_modrdn(
                ks = count_filter_len(ud, newrdn[i]->la_private, bv, ks);
        }
 
-       key = ch_malloc(ks);
+       if ( !ks )
+               return SLAP_CB_CONTINUE;
+
+       ks += ALLOC_EXTRA;
+       key = op->o_tmpalloc(ks, op->o_tmpmemctx);
        kp = key + sprintf(key, "(|");
 
        for(i = 0; newrdn[i]; i++) {
                bv[0] = newrdn[i]->la_value;
-               kp = build_filter(ud, newrdn[i]->la_private, bv, kp);
+               kp = build_filter(ud, newrdn[i]->la_private, bv, kp, op->o_tmpmemctx);
        }
 
        sprintf(kp, ")");
@@ -570,7 +587,7 @@ static int unique_modrdn(
 ** it expects to be called automagically during dynamic module initialization
 */
 
-int unique_init() {
+int unique_initialize() {
 
        /* statically declared just after the #includes at top */
        unique.on_bi.bi_type = "unique";
@@ -588,7 +605,7 @@ int unique_init() {
 
 #if SLAPD_OVER_UNIQUE == SLAPD_MOD_DYNAMIC && defined(PIC)
 int init_module(int argc, char *argv[]) {
-       return unique_init();
+       return unique_initialize();
 }
 #endif