Fix rev 1.266, was creating {0}config entry prematurely.

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index c1aa9acbc6be64323212048e0e46e02c9d0968c0..9154600d6dad686341da370da85e6c07b027e6d2 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,10 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include "lutil.h"
+
+const Filter *slap_filter_objectClass_pres;
+const struct berval *slap_filterstr_objectClass_pres;
 
 static int     get_filter_list(
        Operation *op,
@@ -56,6 +60,26 @@ static int   get_simple_vrFilter(
        ValuesReturnFilter **f,
        const char **text );
 
+int
+filter_init( void )
+{
+       static Filter filter_objectClass_pres = { LDAP_FILTER_PRESENT };
+       static struct berval filterstr_objectClass_pres = BER_BVC("(objectClass=*)");
+
+       filter_objectClass_pres.f_desc = slap_schema.si_ad_objectClass;
+
+       slap_filter_objectClass_pres = &filter_objectClass_pres;
+       slap_filterstr_objectClass_pres = &filterstr_objectClass_pres;
+
+       return 0;
+}
+
+void
+filter_destroy( void )
+{
+       return;
+}
+
 int
 get_filter(
        Operation *op,
@@ -543,7 +567,7 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
 {
        int             i;
        Filter          *p;
-       struct berval   tmp;
+       struct berval   tmp, value;
        static struct berval
                        ber_bvfalse = BER_BVC( "(?=false)" ),
                        ber_bvtrue = BER_BVC( "(?=true)" ),
@@ -582,7 +606,15 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
                sign = "~=";
 
 simple:
-               filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
+               value = f->f_av_value;
+               if ( f->f_av_desc->ad_type->sat_equality &&
+                       ( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER )) {
+                       f->f_av_desc->ad_type->sat_equality->smr_normalize(
+                               (SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
+                               NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );
+               }
+
+               filter_escape_value_x( &value, &tmp, op->o_tmpmemctx );
                /* NOTE: tmp can legitimately be NULL (meaning empty) 
                 * since in a Filter values in AVAs are supposed
                 * to have been normalized, meaning that an empty value
@@ -598,6 +630,10 @@ simple:
                        f->f_av_desc->ad_cname.bv_val, sign,
                        tmp.bv_len ? tmp.bv_val : "" );
 
+               if ( value.bv_val != f->f_av_value.bv_val ) {
+                       ber_memfree_x( value.bv_val, op->o_tmpmemctx );
+               }
+
                ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
                break;
 
@@ -618,16 +654,16 @@ simple:
                        len = fstr->bv_len;
 
                        filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );
-                       tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );
+                       tmplen = tmp.bv_len;
 
                        fstr->bv_len += tmplen;
                        fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
                                fstr->bv_len + 1, op->o_tmpmemctx );
 
-                       snprintf( &fstr->bv_val[len-2],
+                       snprintf( &fstr->bv_val[len - 2],
                                tmplen + STRLENOF( /*(*/ "*)" ) + 1,
                                /* "(attr=" */ "%s*)",
-                               tmp.bv_len ? tmp.bv_val : "(null)");
+                               tmp.bv_len ? tmp.bv_val : "");
 
                        ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
                }
@@ -639,16 +675,16 @@ simple:
                                len = fstr->bv_len;
                                filter_escape_value_x( &f->f_sub_any[i],
                                        &tmp, op->o_tmpmemctx );
-                               tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );
+                               tmplen = tmp.bv_len;
 
                                fstr->bv_len += tmplen + STRLENOF( /*(*/ ")" );
                                fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
                                        fstr->bv_len + 1, op->o_tmpmemctx );
 
-                               snprintf( &fstr->bv_val[len-1],
+                               snprintf( &fstr->bv_val[len - 1],
                                        tmplen + STRLENOF( /*(*/ "*)" ) + 1,
                                        /* "(attr=[init]*[any*]" */ "%s*)",
-                                       tmp.bv_len ? tmp.bv_val : "(null)");
+                                       tmp.bv_len ? tmp.bv_val : "");
                                ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
                        }
                }
@@ -659,16 +695,16 @@ simple:
                        len = fstr->bv_len;
 
                        filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );
-                       tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );
+                       tmplen = tmp.bv_len;
 
                        fstr->bv_len += tmplen;
                        fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
                                fstr->bv_len + 1, op->o_tmpmemctx );
 
-                       snprintf( &fstr->bv_val[len-1],
+                       snprintf( &fstr->bv_val[len - 1],
                                tmplen + STRLENOF( /*(*/ ")" ) + 1,
                                /* "(attr=[init*][any*]" */ "%s)",
-                               tmp.bv_len ? tmp.bv_val : "(null)");
+                               tmp.bv_len ? tmp.bv_val : "");
 
                        ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
                }
@@ -1001,7 +1037,7 @@ get_simple_vrFilter(
        }
 
        if ( err == LDAP_SUCCESS ) {
-               *filt = ch_malloc( sizeof vrf );
+               *filt = op->o_tmpalloc( sizeof vrf, op->o_tmpmemctx );
                **filt = vrf;
        }
 
@@ -1170,13 +1206,14 @@ simple_vrFilter2bv( Operation *op, ValuesReturnFilter *vrf, struct berval *fstr
 {
        struct berval tmp;
        ber_len_t len;
+       int undef;
 
        if ( vrf == NULL ) {
                ber_str2bv_x( "No filter!", STRLENOF("No filter!"), 1, fstr,
                        op->o_tmpmemctx );
                return;
        }
-       int undef = vrf->vrf_choice & SLAPD_FILTER_UNDEFINED;
+       undef = vrf->vrf_choice & SLAPD_FILTER_UNDEFINED;
 
        switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
        case LDAP_FILTER_EQUALITY: