/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
* Portions Copyright 1999-2003 Howard Chu.
* Portions Copyright 2000-2003 Pierangelo Masarati.
* All rights reserved.
/* 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;
}
Avlnode *tree;
struct ldapmapping fmapping;
+ if ( map == NULL ) {
+ return 0;
+ }
+
assert( m != NULL );
if ( remap == RWM_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;
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,
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 ) );
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;
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 ) {
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;
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;
struct berval atmp,
vtmp,
- tmp;
+ *tmp;
static struct berval
/* better than nothing... */
ber_bvfalse = BER_BVC( "(!(objectClass=*))" ),
ber_bvnone = BER_BVC( "(?=none)" );
ber_len_t len;
+ assert( fstr != NULL );
+ BER_BVZERO( fstr );
+
if ( f == NULL ) {
ber_dupbv( fstr, &ber_bvnone );
- return -1;
+ return LDAP_OTHER;
}
switch ( f->f_choice ) {
f->f_choice == LDAP_FILTER_OR ? '|' : '!' );
for ( p = f->f_list; p != NULL; p = p->f_next ) {
+ int rc;
+
len = fstr->bv_len;
- if ( rwm_int_filter_map_rewrite( op, dc, p, &vtmp ) )
- {
- return -1;
+ rc = rwm_int_filter_map_rewrite( op, dc, p, &vtmp );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
}
fstr->bv_len += vtmp.bv_len;
case SLAPD_FILTER_COMPUTED:
switch ( f->f_result ) {
case LDAP_COMPARE_FALSE:
+ /* FIXME: treat UNDEFINED as FALSE */
case SLAPD_COMPARE_UNDEFINED:
if ( dc->rwmap->rwm_flags & RWM_F_SUPPORT_T_F ) {
- tmp = ber_bvtf_false;
+ tmp = &ber_bvtf_false;
break;
}
- tmp = ber_bvfalse;
+ tmp = &ber_bvfalse;
break;
case LDAP_COMPARE_TRUE:
if ( dc->rwmap->rwm_flags & RWM_F_SUPPORT_T_F ) {
- tmp = ber_bvtf_true;
- } else {
- tmp = ber_bvtrue;
+ tmp = &ber_bvtf_true;
+ break;
}
+ tmp = &ber_bvtrue;
break;
default:
- tmp = ber_bverror;
+ tmp = &ber_bverror;
break;
}
- ber_dupbv( fstr, &tmp );
+ ber_dupbv( fstr, tmp );
break;
default:
break;
}
- return 0;
+ return LDAP_SUCCESS;
}
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;
#ifdef ENABLE_REWRITE
if ( rc != 0 ) {
- return LDAP_OTHER;
+ return rc;
}
fdc = *dc;
rc = LDAP_OTHER;
break;
}
-
#endif /* ENABLE_REWRITE */
+
return rc;
}
int
rwm_referral_result_rewrite(
dncookie *dc,
- BerVarray a_vals
-)
+ BerVarray a_vals )
{
int i, last;
int
rwm_dnattr_result_rewrite(
dncookie *dc,
- BerVarray a_vals
-)
+ BerVarray a_vals )
{
int i, last;
return 0;
}
+void
+rwm_mapping_dst_free( void *v_mapping )
+{
+ struct ldapmapping *mapping = v_mapping;
+
+ if ( BER_BVISEMPTY( &mapping[0].m_dst ) ) {
+ rwm_mapping_free( &mapping[ -1 ] );
+ }
+}
+
void
rwm_mapping_free( void *v_mapping )
{