check for ee == NULL

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

diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index dce3a95f73087fdd218f13695ac00cf23b289758..f18d80d2716ee404bd653a8cb0967f81c2c2add3 100644 (file)
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -142,6 +142,13 @@ rwm_map( struct ldapmap *map, struct berval *s, struct berval *bv, int remap )
 {
        struct ldapmapping *mapping;
 
+       /* map->map may be NULL when mapping is configured,
+        * but map->remap can't */
+       if ( map->remap == NULL ) {
+               *bv = *s;
+               return;
+       }
+
        BER_BVZERO( bv );
        ( void )rwm_mapping( map, s, &mapping, remap );
        if ( mapping != NULL ) {
@@ -396,9 +403,7 @@ map_attr_value(
                        dncookie        fdc = *dc;
                        int             rc;
 
-#ifdef ENABLE_REWRITE
                        fdc.ctx = "searchFilterAttrDN";
-#endif /* ENABLE_REWRITE */
 
                        vtmp = *value;
                        rc = rwm_dn_massage_normalize( &fdc, value, &vtmp );
@@ -451,6 +456,7 @@ rwm_int_filter_map_rewrite(
 {
        int             i;
        Filter          *p;
+       AttributeDescription *ad;
        struct berval   atmp,
                        vtmp,
                        *tmp;
@@ -478,9 +484,10 @@ rwm_int_filter_map_rewrite(
                return LDAP_OTHER;
        }
 
-       switch ( f->f_choice ) {
+       switch ( f->f_choice & SLAPD_FILTER_MASK ) {
        case LDAP_FILTER_EQUALITY:
-               if ( map_attr_value( dc, &f->f_av_desc, &atmp,
+               ad = f->f_av_desc;
+               if ( map_attr_value( dc, &ad, &atmp,
                                        &f->f_av_value, &vtmp, RWM_MAP ) )
                {
                        goto computed;
@@ -490,13 +497,14 @@ rwm_int_filter_map_rewrite(
                fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
-                       atmp.bv_val, vtmp.bv_val );
+                       atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
                ch_free( vtmp.bv_val );
                break;
 
        case LDAP_FILTER_GE:
-               if ( map_attr_value( dc, &f->f_av_desc, &atmp,
+               ad = f->f_av_desc;
+               if ( map_attr_value( dc, &ad, &atmp,
                                        &f->f_av_value, &vtmp, RWM_MAP ) )
                {
                        goto computed;
@@ -506,13 +514,14 @@ rwm_int_filter_map_rewrite(
                fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
-                       atmp.bv_val, vtmp.bv_val );
+                       atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
                ch_free( vtmp.bv_val );
                break;
 
        case LDAP_FILTER_LE:
-               if ( map_attr_value( dc, &f->f_av_desc, &atmp,
+               ad = f->f_av_desc;
+               if ( map_attr_value( dc, &ad, &atmp,
                                        &f->f_av_value, &vtmp, RWM_MAP ) )
                {
                        goto computed;
@@ -522,13 +531,14 @@ rwm_int_filter_map_rewrite(
                fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
-                       atmp.bv_val, vtmp.bv_val );
+                       atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
                ch_free( vtmp.bv_val );
                break;
 
        case LDAP_FILTER_APPROX:
-               if ( map_attr_value( dc, &f->f_av_desc, &atmp,
+               ad = f->f_av_desc;
+               if ( map_attr_value( dc, &ad, &atmp,
                                        &f->f_av_value, &vtmp, RWM_MAP ) )
                {
                        goto computed;
@@ -538,13 +548,14 @@ rwm_int_filter_map_rewrite(
                fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
-                       atmp.bv_val, vtmp.bv_val );
+                       atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
                ch_free( vtmp.bv_val );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
-               if ( map_attr_value( dc, &f->f_sub_desc, &atmp,
+               ad = f->f_sub_desc;
+               if ( map_attr_value( dc, &ad, &atmp,
                                        NULL, NULL, RWM_MAP ) )
                {
                        goto computed;
@@ -568,7 +579,7 @@ rwm_int_filter_map_rewrite(
 
                        snprintf( &fstr->bv_val[len - 2], vtmp.bv_len + 3,
                                /* "(attr=" */ "%s*)",
-                               vtmp.bv_val );
+                               vtmp.bv_len ? vtmp.bv_val : "" );
 
                        ch_free( vtmp.bv_val );
                }
@@ -583,7 +594,7 @@ rwm_int_filter_map_rewrite(
 
                                snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
                                        /* "(attr=[init]*[any*]" */ "%s*)",
-                                       vtmp.bv_val );
+                                       vtmp.bv_len ? vtmp.bv_val : "" );
                                ch_free( vtmp.bv_val );
                        }
                }
@@ -598,7 +609,7 @@ rwm_int_filter_map_rewrite(
 
                        snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
                                /* "(attr=[init*][any*]" */ "%s)",
-                               vtmp.bv_val );
+                               vtmp.bv_len ? vtmp.bv_val : "" );
 
                        ch_free( vtmp.bv_val );
                }
@@ -606,7 +617,8 @@ rwm_int_filter_map_rewrite(
                break;
 
        case LDAP_FILTER_PRESENT:
-               if ( map_attr_value( dc, &f->f_desc, &atmp,
+               ad = f->f_desc;
+               if ( map_attr_value( dc, &ad, &atmp,
                                        NULL, NULL, RWM_MAP ) )
                {
                        goto computed;
@@ -643,7 +655,7 @@ rwm_int_filter_map_rewrite(
                        fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
 
                        snprintf( &fstr->bv_val[len-1], vtmp.bv_len + 2, 
-                               /*"("*/ "%s)", vtmp.bv_val );
+                               /*"("*/ "%s)", vtmp.bv_len ? vtmp.bv_val : "" );
 
                        ch_free( vtmp.bv_val );
                }
@@ -652,7 +664,8 @@ rwm_int_filter_map_rewrite(
 
        case LDAP_FILTER_EXT: {
                if ( f->f_mr_desc ) {
-                       if ( map_attr_value( dc, &f->f_mr_desc, &atmp,
+                       ad = f->f_mr_desc;
+                       if ( map_attr_value( dc, &ad, &atmp,
                                                &f->f_mr_value, &vtmp, RWM_MAP ) )
                        {
                                goto computed;
@@ -675,12 +688,12 @@ rwm_int_filter_map_rewrite(
                        f->f_mr_dnattrs ? ":dn" : "",
                        !BER_BVISEMPTY( &f->f_mr_rule_text ) ? ":" : "",
                        !BER_BVISEMPTY( &f->f_mr_rule_text ) ? f->f_mr_rule_text.bv_val : "",
-                       vtmp.bv_val );
+                       vtmp.bv_len ? vtmp.bv_val : "" );
                ch_free( vtmp.bv_val );
                break;
        }
 
-       case 0:
+       case -1:
 computed:;
                filter_free_x( op, f );
                f->f_choice = SLAPD_FILTER_COMPUTED;
@@ -736,7 +749,6 @@ rwm_filter_map_rewrite(
 
        rc = rwm_int_filter_map_rewrite( op, dc, f, fstr );
 
-#ifdef ENABLE_REWRITE
        if ( rc != 0 ) {
                return rc;
        }
@@ -753,7 +765,9 @@ rwm_filter_map_rewrite(
        case REWRITE_REGEXEC_OK:
                if ( !BER_BVISNULL( fstr ) ) {
                        fstr->bv_len = strlen( fstr->bv_val );
-                       ch_free( ftmp.bv_val );
+                       if ( fstr->bv_val != ftmp.bv_val ) {
+                               ch_free( ftmp.bv_val );
+                       }
 
                } else {
                        *fstr = ftmp;
@@ -781,7 +795,6 @@ rwm_filter_map_rewrite(
                rc = LDAP_OTHER;
                break;
        }
-#endif /* ENABLE_REWRITE */
 
        return rc;
 }
@@ -817,14 +830,9 @@ rwm_referral_rewrite(
         * Rewrite the dn if needed
         */
        dc.rwmap = rwmap;
-#ifdef ENABLE_REWRITE
        dc.conn = op->o_conn;
        dc.rs = rs;
        dc.ctx = (char *)cookie;
-#else /* ! ENABLE_REWRITE */
-       dc.tofrom = ((int *)cookie)[0];
-       dc.normalized = 0;
-#endif /* ! ENABLE_REWRITE */
 
        for ( last = 0; !BER_BVISNULL( &a_vals[last] ); last++ )
                ;
@@ -990,14 +998,9 @@ rwm_dnattr_rewrite(
         * Rewrite the dn if needed
         */
        dc.rwmap = rwmap;
-#ifdef ENABLE_REWRITE
        dc.conn = op->o_conn;
        dc.rs = rs;
        dc.ctx = (char *)cookie;
-#else /* ! ENABLE_REWRITE */
-       dc.tofrom = ((int *)cookie)[0];
-       dc.normalized = 0;
-#endif /* ! ENABLE_REWRITE */
 
        for ( last = 0; !BER_BVISNULL( &in[last] ); last++ );
        last--;