Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 02467fb301e45431ad92f9d3a5c8dd16b23327ad..b859f734d81b858484b86d1b68512f5f5d220b99 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-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -402,8 +402,7 @@ get_ssa(
        {
                unsigned usage;
 
-               rc = ber_scanf( ber, "m", &value );
-               if ( rc == LBER_ERROR ) {
+               if ( ber_scanf( ber, "m", &value ) == LBER_ERROR ) {
                        rc = SLAPD_DISCONNECT;
                        goto return_error;
                }
@@ -521,6 +520,8 @@ filter_free_x( Operation *op, Filter *f, int freeme )
 
        switch ( f->f_choice ) {
        case LDAP_FILTER_PRESENT:
+               if ( f->f_desc->ad_flags & SLAP_DESC_TEMPORARY )
+                       op->o_tmpfree( f->f_desc, op->o_tmpmemctx );
                break;
 
        case LDAP_FILTER_EQUALITY:
@@ -584,6 +585,12 @@ filter_free( Filter *f )
 
 void
 filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
+{
+       filter2bv_undef_x( op, f, 0, fstr );
+}
+
+void
+filter2bv_undef_x( Operation *op, Filter *f, int noundef, struct berval *fstr )
 {
        int             i;
        Filter          *p;
@@ -594,10 +601,12 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
                        ber_bvundefined = BER_BVC( "(?=undefined)" ),
                        ber_bverror = BER_BVC( "(?=error)" ),
                        ber_bvunknown = BER_BVC( "(?=unknown)" ),
-                       ber_bvnone = BER_BVC( "(?=none)" );
+                       ber_bvnone = BER_BVC( "(?=none)" ),
+                       ber_bvF = BER_BVC( "(|)" ),
+                       ber_bvT = BER_BVC( "(&)" );
        ber_len_t       len;
        ber_tag_t       choice;
-       int undef;
+       int undef, undef2;
        char *sign;
 
        if ( f == NULL ) {
@@ -606,6 +615,7 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
        }
 
        undef = f->f_choice & SLAPD_FILTER_UNDEFINED;
+       undef2 = (undef && !noundef);
        choice = f->f_choice & SLAPD_FILTER_MASK;
 
        switch ( choice ) {
@@ -643,12 +653,12 @@ simple:
                 * is legal for that attribute's syntax */
 
                fstr->bv_len += f->f_av_desc->ad_cname.bv_len + tmp.bv_len;
-               if ( undef )
+               if ( undef2 )
                        fstr->bv_len++;
                fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s)",
-                       undef ? "?" : "",
+                       undef2 ? "?" : "",
                        f->f_av_desc->ad_cname.bv_val, sign,
                        tmp.bv_len ? tmp.bv_val : "" );
 
@@ -662,12 +672,12 @@ simple:
        case LDAP_FILTER_SUBSTRINGS:
                fstr->bv_len = f->f_sub_desc->ad_cname.bv_len +
                        STRLENOF("(=*)");
-               if ( undef )
+               if ( undef2 )
                        fstr->bv_len++;
                fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s=*)",
-                       undef ? "?" : "",
+                       undef2 ? "?" : "",
                        f->f_sub_desc->ad_cname.bv_val );
 
                if ( f->f_sub_initial.bv_val != NULL ) {
@@ -736,13 +746,13 @@ simple:
        case LDAP_FILTER_PRESENT:
                fstr->bv_len = f->f_desc->ad_cname.bv_len +
                        STRLENOF("(=*)");
-               if ( undef )
+               if ( undef2 )
                        fstr->bv_len++;
 
                fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s=*)",
-                       undef ? "?" : "",
+                       undef2 ? "?" : "",
                        f->f_desc->ad_cname.bv_val );
                break;
 
@@ -759,7 +769,7 @@ simple:
                for ( p = f->f_list; p != NULL; p = p->f_next ) {
                        len = fstr->bv_len;
 
-                       filter2bv_x( op, p, &tmp );
+                       filter2bv_undef_x( op, p, noundef, &tmp );
                        
                        fstr->bv_len += tmp.bv_len;
                        fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
@@ -791,13 +801,14 @@ simple:
                }
                
                fstr->bv_len = ad.bv_len +
+                       ( undef2 ? 1 : 0 ) +
                        ( f->f_mr_dnattrs ? STRLENOF(":dn") : 0 ) +
-                       ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
+                       ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len + STRLENOF(":") : 0 ) +
                        tmp.bv_len + STRLENOF("(:=)");
                fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s%s:=%s)",
-                       undef ? "?" : "",
+                       undef2 ? "?" : "",
                        ad.bv_val,
                        f->f_mr_dnattrs ? ":dn" : "",
                        f->f_mr_rule_text.bv_len ? ":" : "",
@@ -809,11 +820,11 @@ simple:
        case SLAPD_FILTER_COMPUTED:
                switch ( f->f_result ) {
                case LDAP_COMPARE_FALSE:
-                       tmp = ber_bvfalse;
+                       tmp = ( noundef ? ber_bvF : ber_bvfalse );
                        break;
 
                case LDAP_COMPARE_TRUE:
-                       tmp = ber_bvtrue;
+                       tmp = ( noundef ? ber_bvT : ber_bvtrue );
                        break;
                        
                case SLAPD_COMPARE_UNDEFINED:
@@ -836,6 +847,12 @@ simple:
 
 void
 filter2bv( Filter *f, struct berval *fstr )
+{
+       filter2bv_undef( f, 0, fstr );
+}
+
+void
+filter2bv_undef( Filter *f, int noundef, struct berval *fstr )
 {
        Operation op;
        Opheader ohdr;
@@ -844,7 +861,7 @@ filter2bv( Filter *f, struct berval *fstr )
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;
 
-       filter2bv_x( &op, f, fstr );
+       filter2bv_undef_x( &op, f, noundef, fstr );
 }
 
 Filter *