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

ITS#6526

parent 06bcb025
...@@ -37,6 +37,7 @@ OpenLDAP 2.4.22 Engineering ...@@ -37,6 +37,7 @@ OpenLDAP 2.4.22 Engineering
Fixed slapo-pcache to release its own entries (ITS#6484) Fixed slapo-pcache to release its own entries (ITS#6484)
Fixed slapo-pcache with NULL backend (ITS#6490) Fixed slapo-pcache with NULL backend (ITS#6490)
Fixed slapo-rwm entry release handling (ITS#6484) Fixed slapo-rwm entry release handling (ITS#6484)
Fixed slapo-rwm memory handling with rewrites (ITS#6526)
Fixed slapo-rwm olcRwmMap handling (ITS#6436) Fixed slapo-rwm olcRwmMap handling (ITS#6436)
Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423) Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423)
Fixed slapo-syncprov memory leak (ITS#6459) Fixed slapo-syncprov memory leak (ITS#6459)
......
...@@ -2114,7 +2114,6 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2114,7 +2114,6 @@ rwm_cf_gen( ConfigArgs *c )
switch ( c->type ) { switch ( c->type ) {
case RWM_CF_REWRITE: case RWM_CF_REWRITE:
if ( c->valx >= 0 ) { if ( c->valx >= 0 ) {
ConfigArgs ca = { 0 };
int i; int i;
for ( i = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ ) for ( i = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
...@@ -2139,6 +2138,8 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2139,6 +2138,8 @@ rwm_cf_gen( ConfigArgs *c )
for ( i = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ ) for ( i = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
{ {
ConfigArgs ca = { 0 };
ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val; ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
ca.argc = 0; ca.argc = 0;
config_fp_parse_line( &ca ); config_fp_parse_line( &ca );
...@@ -2282,7 +2283,6 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2282,7 +2283,6 @@ rwm_cf_gen( ConfigArgs *c )
case RWM_CF_REWRITE: case RWM_CF_REWRITE:
if ( c->valx >= 0 ) { if ( c->valx >= 0 ) {
struct rewrite_info *rwm_rw = rwmap->rwm_rw; struct rewrite_info *rwm_rw = rwmap->rwm_rw;
ConfigArgs ca = { 0 };
int i, last; int i, last;
for ( last = 0; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ last ] ); last++ ) for ( last = 0; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ last ] ); last++ )
...@@ -2296,6 +2296,8 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2296,6 +2296,8 @@ rwm_cf_gen( ConfigArgs *c )
rc = rwm_info_init( &rwmap->rwm_rw ); rc = rwm_info_init( &rwmap->rwm_rw );
for ( i = 0; i < c->valx; i++ ) { for ( i = 0; i < c->valx; i++ ) {
ConfigArgs ca = { 0 };
ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val; ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
ca.argc = 0; ca.argc = 0;
config_fp_parse_line( &ca ); config_fp_parse_line( &ca );
...@@ -2344,6 +2346,8 @@ rwm_cf_gen( ConfigArgs *c ) ...@@ -2344,6 +2346,8 @@ rwm_cf_gen( ConfigArgs *c )
for ( i = c->valx; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ ) for ( i = c->valx; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
{ {
ConfigArgs ca = { 0 };
ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val; ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
ca.argc = 0; ca.argc = 0;
config_fp_parse_line( &ca ); config_fp_parse_line( &ca );
......
Supports Markdown
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