From: Nadezhda Ivanova <nivanova@symas.com>
Date: Tue, 12 Sep 2017 14:14:30 +0000 (+0300)
Subject: ITS#8404 Fix an assertion failure during modify of olcDbRewrite in back-meta
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da170cbe3b1f354ad1dcdf1e2d1ce8128e9ad642;p=openldap

ITS#8404 Fix an assertion failure during modify of olcDbRewrite in back-meta
---

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index e060e0e18c..cfcb3d8f33 100644
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -1827,13 +1827,63 @@ meta_back_cf_gen( ConfigArgs *c )
 
 		case LDAP_BACK_CFG_SUFFIXM:	/* unused */
 		case LDAP_BACK_CFG_REWRITE:
-			if ( mt->mt_rwmap.rwm_bva_rewrite ) {
-				ber_bvarray_free( mt->mt_rwmap.rwm_bva_rewrite );
-				mt->mt_rwmap.rwm_bva_rewrite = NULL;
-			}
-			if ( mt->mt_rwmap.rwm_rw )
+		{
+			if ( c->valx >= 0 ) {
+				int i;
+
+				for ( i = 0; !BER_BVISNULL( &mt->mt_rwmap.rwm_bva_rewrite[ i ] ); i++ );
+
+				if ( c->valx >= i ) {
+					rc = 1;
+					break;
+				}
+
+				ber_memfree( mt->mt_rwmap.rwm_bva_rewrite[ c->valx ].bv_val );
+				for ( i = c->valx; !BER_BVISNULL( &mt->mt_rwmap.rwm_bva_rewrite[ i + 1 ] ); i++ )
+				{
+					mt->mt_rwmap.rwm_bva_rewrite[ i ] = mt->mt_rwmap.rwm_bva_rewrite[ i + 1 ];
+				}
+				BER_BVZERO( &mt->mt_rwmap.rwm_bva_rewrite[ i ] );
+
 				rewrite_info_delete( &mt->mt_rwmap.rwm_rw );
-			break;
+				assert( mt->mt_rwmap.rwm_rw == NULL );
+
+				rc = meta_rwi_init( &mt->mt_rwmap.rwm_rw );
+
+				for ( i = 0; !BER_BVISNULL( &mt->mt_rwmap.rwm_bva_rewrite[ i ] ); i++ )
+				{
+					ConfigArgs ca = { 0 };
+
+					ca.line = mt->mt_rwmap.rwm_bva_rewrite[ i ].bv_val;
+					init_config_argv( &ca );
+					config_parse_ldif( &ca );
+
+					if ( !strcasecmp( ca.argv[0], "suffixmassage" )) {
+						rc = meta_suffixm_config( &ca, ca.argc, ca.argv, mt );
+					} else {
+						rc = rewrite_parse( mt->mt_rwmap.rwm_rw,
+								    c->fname, c->lineno, ca.argc, ca.argv );
+					}
+
+
+					ch_free( ca.tline );
+					ch_free( ca.argv );
+
+					assert( rc == 0 );
+				}
+
+			} else if ( mt->mt_rwmap.rwm_rw != NULL ) {
+				if ( mt->mt_rwmap.rwm_bva_rewrite ) {
+					ber_bvarray_free( mt->mt_rwmap.rwm_bva_rewrite );
+					mt->mt_rwmap.rwm_bva_rewrite = NULL;
+				}
+				if ( mt->mt_rwmap.rwm_rw )
+					rewrite_info_delete( &mt->mt_rwmap.rwm_rw );
+
+				meta_rwi_init( &mt->mt_rwmap.rwm_rw );
+			}
+		}
+		break;
 
 		case LDAP_BACK_CFG_MAP:
 			if ( mt->mt_rwmap.rwm_bva_map ) {