trim listed modules

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

diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index 13a261dcc2396c463ae8fb40de1d7c9a0b8df657..c05032a36aa3cd18d30f1fd79c309c4c2834ec2e 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.
@@ -84,6 +84,7 @@ rwm_map_init( struct ldapmap *lm, struct ldapmapping **m )
        /* FIXME: I don't think this is needed any more... */
        rc = slap_str2ad( "objectClass", &mapping[0].m_src_ad, &text );
        if ( rc != LDAP_SUCCESS ) {
+               ch_free( mapping );
                return rc;
        }
 
@@ -112,6 +113,10 @@ rwm_mapping( struct ldapmap *map, struct berval *s, struct ldapmapping **m, int
        Avlnode *tree;
        struct ldapmapping fmapping;
 
+       if ( map == NULL ) {
+               return 0;
+       }
+
        assert( m != NULL );
 
        if ( remap == RWM_REMAP ) {
@@ -137,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 ) {
@@ -156,12 +168,11 @@ rwm_map( struct ldapmap *map, struct berval *s, struct berval *bv, int remap )
  */
 int
 rwm_map_attrnames(
-               struct ldapmap *at_map,
-               struct ldapmap *oc_map,
-               AttributeName *an,
-               AttributeName **anp,
-               int remap
-)
+       struct ldapmap  *at_map,
+       struct ldapmap  *oc_map,
+       AttributeName   *an,
+       AttributeName   **anp,
+       int             remap )
 {
        int             i, j;
 
@@ -246,7 +257,6 @@ rwm_map_attrnames(
                        at_drop_missing = rwm_mapping( at_map, &an[i].an_name, &m, remap );
                
                        if ( at_drop_missing || !m ) {
-
                                oc_drop_missing = rwm_mapping( oc_map, &an[i].an_name, &m, remap );
 
                                /* if both at_map and oc_map required to drop missing,
@@ -301,6 +311,7 @@ rwm_map_attrnames(
        if ( j == 0 && i != 0 ) {
                memset( &(*anp)[0], 0, sizeof( AttributeName ) );
                BER_BVSTR( &(*anp)[0].an_name, LDAP_NO_ATTRS );
+               j = 1;
        }
        memset( &(*anp)[j], 0, sizeof( AttributeName ) );
 
@@ -309,11 +320,10 @@ rwm_map_attrnames(
 
 int
 rwm_map_attrs(
-               struct ldapmap *at_map,
-               AttributeName *an,
-               int remap,
-               char ***mapped_attrs
-)
+       struct ldapmap  *at_map,
+       AttributeName   *an,
+       int             remap,
+       char            ***mapped_attrs )
 {
        int i, j;
        char **na;
@@ -323,9 +333,8 @@ rwm_map_attrs(
                return LDAP_SUCCESS;
        }
 
-       for ( i = 0; !BER_BVISNULL( &an[ i ].an_name ); i++ ) {
-               /*  */
-       }
+       for ( i = 0; !BER_BVISNULL( &an[ i ].an_name ); i++ )
+               /* count'em */ ;
 
        na = (char **)ch_calloc( i + 1, sizeof( char * ) );
        if ( na == NULL ) {
@@ -361,12 +370,12 @@ rwm_map_attrs(
 
 static int
 map_attr_value(
-               dncookie                *dc,
-               AttributeDescription    **adp,
-               struct berval           *mapped_attr,
-               struct berval           *value,
-               struct berval           *mapped_value,
-               int                     remap )
+       dncookie                *dc,
+       AttributeDescription    **adp,
+       struct berval           *mapped_attr,
+       struct berval           *value,
+       struct berval           *mapped_value,
+       int                     remap )
 {
        struct berval           vtmp = BER_BVNULL;
        int                     freeval = 0;
@@ -442,13 +451,14 @@ map_attr_value(
 
 static int
 rwm_int_filter_map_rewrite(
-               Operation               *op,
-               dncookie                *dc,
-               Filter                  *f,
-               struct berval           *fstr )
+       Operation               *op,
+       dncookie                *dc,
+       Filter                  *f,
+       struct berval           *fstr )
 {
        int             i;
        Filter          *p;
+       AttributeDescription *ad;
        struct berval   atmp,
                        vtmp,
                        *tmp;
@@ -468,14 +478,18 @@ rwm_int_filter_map_rewrite(
                        ber_bvnone = BER_BVC( "(?=none)" );
        ber_len_t       len;
 
+       assert( fstr != NULL );
+       BER_BVZERO( fstr );
+
        if ( f == NULL ) {
                ber_dupbv( fstr, &ber_bvnone );
                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;
@@ -491,7 +505,8 @@ rwm_int_filter_map_rewrite(
                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;
@@ -507,7 +522,8 @@ rwm_int_filter_map_rewrite(
                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;
@@ -523,7 +539,8 @@ rwm_int_filter_map_rewrite(
                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;
@@ -539,7 +556,8 @@ rwm_int_filter_map_rewrite(
                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;
@@ -601,7 +619,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;
@@ -647,7 +666,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,7 +695,7 @@ rwm_int_filter_map_rewrite(
                break;
        }
 
-       case 0:
+       case -1:
 computed:;
                filter_free_x( op, f );
                f->f_choice = SLAPD_FILTER_COMPUTED;
@@ -720,10 +740,10 @@ computed:;
 
 int
 rwm_filter_map_rewrite(
-               Operation               *op,
-               dncookie                *dc,
-               Filter                  *f,
-               struct berval           *fstr )
+       Operation               *op,
+       dncookie                *dc,
+       Filter                  *f,
+       struct berval           *fstr )
 {
        int             rc;
        dncookie        fdc;
@@ -1077,8 +1097,7 @@ rwm_dnattr_rewrite(
 int
 rwm_referral_result_rewrite(
        dncookie                *dc,
-       BerVarray               a_vals
-)
+       BerVarray               a_vals )
 {
        int             i, last;
 
@@ -1156,8 +1175,7 @@ rwm_referral_result_rewrite(
 int
 rwm_dnattr_result_rewrite(
        dncookie                *dc,
-       BerVarray               a_vals
-)
+       BerVarray               a_vals )
 {
        int             i, last;