Commit bc7057c7 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5960

parent b28f5ab7
...@@ -8,6 +8,7 @@ OpenLDAP 2.4.15 Release (2009/02/19) ...@@ -8,6 +8,7 @@ OpenLDAP 2.4.15 Release (2009/02/19)
Fixed slapd-meta with entries with invalid attrs (ITS#5959) Fixed slapd-meta with entries with invalid attrs (ITS#5959)
Fixed slapo-pcache caching invalid entries (ITS#5927) Fixed slapo-pcache caching invalid entries (ITS#5927)
Fixed slapo-rwm objectClass preservation (ITS#5760) Fixed slapo-rwm objectClass preservation (ITS#5760)
Fixed slapo-rwm rwm_bva_rewrite handling (ITS#5960)
Build Environment Build Environment
Fixed tester library linking for windows (ITS#5740) Fixed tester library linking for windows (ITS#5740)
......
...@@ -2162,7 +2162,7 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2162,7 +2162,7 @@ rwm_cf_gen( ConfigArgs *c )
ConfigArgs ca = { 0 }; ConfigArgs ca = { 0 };
int i, last; int i, last;
for ( last = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ last ] ); last++ ) for ( last = 0; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ last ] ); last++ )
/* count'em */ ; /* count'em */ ;
if ( c->valx > last ) { if ( c->valx > last ) {
...@@ -2218,7 +2218,7 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2218,7 +2218,7 @@ rwm_cf_gen( ConfigArgs *c )
return 1; return 1;
} }
for ( i = c->valx; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ ) for ( i = c->valx; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
{ {
ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val; ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
ca.argc = 0; ca.argc = 0;
...@@ -2245,6 +2245,7 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2245,6 +2245,7 @@ rwm_cf_gen( ConfigArgs *c )
rwmap->rwm_bva_rewrite = ch_realloc( rwmap->rwm_bva_rewrite, rwmap->rwm_bva_rewrite = ch_realloc( rwmap->rwm_bva_rewrite,
( last + 2 )*sizeof( struct berval ) ); ( last + 2 )*sizeof( struct berval ) );
BER_BVZERO( &rwmap->rwm_bva_rewrite[last+1] );
for ( i = last - 1; i >= c->valx; i-- ) for ( i = last - 1; i >= c->valx; i-- )
{ {
...@@ -2369,7 +2370,8 @@ rwm_db_destroy( ...@@ -2369,7 +2370,8 @@ rwm_db_destroy(
if ( rwmap->rwm_rw ) { if ( rwmap->rwm_rw ) {
rewrite_info_delete( &rwmap->rwm_rw ); rewrite_info_delete( &rwmap->rwm_rw );
ber_bvarray_free( rwmap->rwm_bva_rewrite ); if ( rwmap->rwm_bva_rewrite )
ber_bvarray_free( rwmap->rwm_bva_rewrite );
} }
avl_free( rwmap->rwm_oc.remap, rwm_mapping_dst_free ); avl_free( rwmap->rwm_oc.remap, rwm_mapping_dst_free );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment