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 ce399a8f9ced466bed4ce73aba7f7a8c3b6960ce..f18d80d2716ee404bd653a8cb0967f81c2c2add3 100644 (file)
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -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 );
@@ -492,7 +497,7 @@ 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;
@@ -509,7 +514,7 @@ 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;
@@ -526,7 +531,7 @@ 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;
@@ -543,7 +548,7 @@ 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;
@@ -574,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 );
                }
@@ -589,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 );
                        }
                }
@@ -604,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 );
                }
@@ -650,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 );
                }
@@ -683,7 +688,7 @@ 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;
        }
@@ -744,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;
        }
@@ -761,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;
@@ -789,7 +795,6 @@ rwm_filter_map_rewrite(
                rc = LDAP_OTHER;
                break;
        }
-#endif /* ENABLE_REWRITE */
 
        return rc;
 }
@@ -825,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++ )
                ;
@@ -998,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--;