refine fix to ITS#4315; apply it to back-meta as well

[openldap] / servers / slapd / back-meta / map.c

diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index 29a1ade97f8a47e41cc0c2379ff9755622258ada..b12abce6cd39be32a7bbfc2ac0c803f6ff3f0ae7 100644 (file)
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,7 @@ ldap_back_map_init ( struct ldapmap *lm, struct ldapmapping **m )
 {
        struct ldapmapping *mapping;
 
-       assert( m );
+       assert( m != NULL );
 
        *m = NULL;
        
@@ -116,7 +116,7 @@ ldap_back_mapping ( struct ldapmap *map, struct berval *s, struct ldapmapping **
        Avlnode *tree;
        struct ldapmapping fmapping;
 
-       assert( m );
+       assert( m != NULL );
 
        if ( remap == BACKLDAP_REMAP ) {
                tree = map->remap;
@@ -208,6 +208,7 @@ map_attr_value(
 
        ldap_back_map( &dc->target->mt_rwmap.rwm_at, &ad->ad_cname, mapped_attr, remap );
        if ( BER_BVISNULL( mapped_attr ) || BER_BVISEMPTY( mapped_attr ) ) {
+#if 0
                /*
                 * FIXME: are we sure we need to search oc_map if at_map fails?
                 */
@@ -215,6 +216,12 @@ map_attr_value(
                if ( BER_BVISNULL( mapped_attr ) || BER_BVISEMPTY( mapped_attr ) ) {
                        *mapped_attr = ad->ad_cname;
                }
+#endif
+               if ( dc->target->mt_rwmap.rwm_at.drop_missing ) {
+                       return -1;
+               }
+
+               *mapped_attr = ad->ad_cname;
        }
 
        if ( value == NULL ) {
@@ -271,13 +278,28 @@ ldap_back_int_filter_map_rewrite(
 {
        int             i;
        Filter          *p;
-       struct berval   atmp;
-       struct berval   vtmp;
+       struct berval   atmp,
+                       vtmp,
+                       *tmp;
+       static struct berval
+                       /* better than nothing... */
+                       ber_bvfalse = BER_BVC( "(!(objectClass=*))" ),
+                       ber_bvtf_false = BER_BVC( "(|)" ),
+                       /* better than nothing... */
+                       ber_bvtrue = BER_BVC( "(objectClass=*)" ),
+                       ber_bvtf_true = BER_BVC( "(&)" ),
+#if 0
+                       /* no longer needed; preserved for completeness */
+                       ber_bvundefined = BER_BVC( "(?=undefined)" ),
+#endif
+                       ber_bverror = BER_BVC( "(?=error)" ),
+                       ber_bvunknown = BER_BVC( "(?=unknown)" ),
+                       ber_bvnone = BER_BVC( "(?=none)" );
        ber_len_t       len;
 
        if ( f == NULL ) {
-               ber_str2bv( "No filter!", STRLENOF( "No filter!" ), 1, fstr );
-               return -1;
+               ber_dupbv( fstr, &ber_bvnone );
+               return LDAP_OTHER;
        }
 
        switch ( f->f_choice ) {
@@ -285,7 +307,7 @@ ldap_back_int_filter_map_rewrite(
                if ( map_attr_value( dc, f->f_av_desc, &atmp,
                                        &f->f_av_value, &vtmp, remap ) )
                {
-                       return -1;
+                       goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -302,7 +324,7 @@ ldap_back_int_filter_map_rewrite(
                if ( map_attr_value( dc, f->f_av_desc, &atmp,
                                        &f->f_av_value, &vtmp, remap ) )
                {
-                       return -1;
+                       goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -319,7 +341,7 @@ ldap_back_int_filter_map_rewrite(
                if ( map_attr_value( dc, f->f_av_desc, &atmp,
                                        &f->f_av_value, &vtmp, remap ) )
                {
-                       return -1;
+                       goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -336,7 +358,7 @@ ldap_back_int_filter_map_rewrite(
                if ( map_attr_value( dc, f->f_av_desc, &atmp,
                                        &f->f_av_value, &vtmp, remap ) )
                {
-                       return -1;
+                       goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -353,7 +375,7 @@ ldap_back_int_filter_map_rewrite(
                if ( map_attr_value( dc, f->f_sub_desc, &atmp,
                                        NULL, NULL, remap ) )
                {
-                       return -1;
+                       goto computed;
                }
 
                /* cannot be a DN ... */
@@ -415,7 +437,7 @@ ldap_back_int_filter_map_rewrite(
                if ( map_attr_value( dc, f->f_desc, &atmp,
                                        NULL, NULL, remap ) )
                {
-                       return -1;
+                       goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + ( STRLENOF( "(=*)" ) );
@@ -436,11 +458,13 @@ ldap_back_int_filter_map_rewrite(
                        f->f_choice == LDAP_FILTER_OR ? '|' : '!' );
 
                for ( p = f->f_list; p != NULL; p = p->f_next ) {
+                       int     rc;
+
                        len = fstr->bv_len;
 
-                       if ( ldap_back_int_filter_map_rewrite( dc, p, &vtmp, remap ) )
-                       {
-                               return -1;
+                       rc = ldap_back_int_filter_map_rewrite( dc, p, &vtmp, remap );
+                       if ( rc != LDAP_SUCCESS ) {
+                               return rc;
                        }
                        
                        fstr->bv_len += vtmp.bv_len;
@@ -459,7 +483,7 @@ ldap_back_int_filter_map_rewrite(
                        if ( map_attr_value( dc, f->f_mr_desc, &atmp,
                                                &f->f_mr_value, &vtmp, remap ) )
                        {
-                               return -1;
+                               goto computed;
                        }
 
                } else {
@@ -486,43 +510,35 @@ ldap_back_int_filter_map_rewrite(
        case SLAPD_FILTER_COMPUTED:
                switch ( f->f_result ) {
                case LDAP_COMPARE_FALSE:
+               /* FIXME: treat UNDEFINED as FALSE */
+               case SLAPD_COMPARE_UNDEFINED:
+computed:;
                        if ( dc->target->mt_flags & LDAP_BACK_F_SUPPORT_T_F ) {
-                               ber_str2bv( "(|)", STRLENOF( "(|)" ), 1, fstr );
-
-                       } else {
-#if 0
-                               ber_str2bv( "(?=false)", STRLENOF( "(?=false)" ), 1, fstr );
-#endif
-                               /* better than nothing... */
-                               ber_str2bv( "(!(objectClass=*))", STRLENOF( "(!(objectClass=*))" ), 1, fstr );
+                               tmp = &ber_bvtf_false;
+                               break;
                        }
+                       tmp = &ber_bvfalse;
                        break;
 
                case LDAP_COMPARE_TRUE:
                        if ( dc->target->mt_flags & LDAP_BACK_F_SUPPORT_T_F ) {
-                               ber_str2bv( "(&)", STRLENOF( "(&)" ), 1, fstr );
-
-                       } else {
-#if 0
-                               ber_str2bv( "(?=true)", STRLENOF( "(?=true)" ), 1, fstr );
-#endif
-                               /* better than nothing... */
-                               ber_str2bv( "(objectClass=*)", STRLENOF( "(objectClass=*)" ), 1, fstr );
+                               tmp = &ber_bvtf_true;
+                               break;
                        }
-                       break;
 
-               case SLAPD_COMPARE_UNDEFINED:
-                       ber_str2bv( "(?=undefined)", STRLENOF( "(?=undefined)" ), 1, fstr );
+                       tmp = &ber_bvtrue;
                        break;
 
                default:
-                       ber_str2bv( "(?=error)", STRLENOF( "(?=error)" ), 1, fstr );
+                       tmp = &ber_bverror;
                        break;
                }
+
+               ber_dupbv( fstr, tmp );
                break;
 
        default:
-               ber_str2bv( "(?=unknown)", STRLENOF( "(?=unknown)" ), 1, fstr );
+               ber_dupbv( fstr, &ber_bvunknown );
                break;
        }
 
@@ -539,6 +555,7 @@ ldap_back_filter_map_rewrite(
        int             rc;
        dncookie        fdc;
        struct berval   ftmp;
+       static char     *dmy = "";
 
        rc = ldap_back_int_filter_map_rewrite( dc, f, fstr, remap );
 
@@ -553,7 +570,7 @@ ldap_back_filter_map_rewrite(
        fdc.ctx = "searchFilter";
        
        switch ( rewrite_session( fdc.target->mt_rwmap.rwm_rw, fdc.ctx,
-                               ( !BER_BVISEMPTY( &ftmp ) ? ftmp.bv_val : "" ),
+                               ( !BER_BVISEMPTY( &ftmp ) ? ftmp.bv_val : dmy ),
                                fdc.conn, &fstr->bv_val ) )
        {
        case REWRITE_REGEXEC_OK:
@@ -586,6 +603,10 @@ ldap_back_filter_map_rewrite(
                rc = LDAP_OTHER;
                break;
        }
+
+       if ( fstr->bv_val == dmy ) {
+               BER_BVZERO( fstr );
+       }
 #endif /* ENABLE_REWRITE */
 
        return rc;
@@ -599,8 +620,8 @@ ldap_back_referral_result_rewrite(
 {
        int             i, last;
 
-       assert( dc );
-       assert( a_vals );
+       assert( dc != NULL );
+       assert( a_vals != NULL );
 
        for ( last = 0; !BER_BVISNULL( &a_vals[ last ] ); last++ )
                ;
@@ -653,6 +674,7 @@ ldap_back_referral_result_rewrite(
 
                                ludp->lud_dn = dn.bv_val;
                                newurl = ldap_url_desc2str( ludp );
+                               free( dn.bv_val );
                                if ( newurl == NULL ) {
                                        /* FIXME: leave attr untouched
                                         * even if ldap_url_desc2str failed...