ITS#7964 avoid double-unescaping rewrite rules

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

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 56004e2af8e21fc98e01af1c951149591e851a52..da254b69c25ed3b3989465859d1b88944cc8e97f 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -2179,7 +2179,8 @@ rwm_cf_gen( ConfigArgs *c )
 
                                        ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
                                        ca.argc = 0;
-                                       config_fp_parse_line( &ca );
+                                       init_config_argv( &ca );
+                                       config_parse_ldif( &ca );
 
                                        argv0 = ca.argv[ 0 ];
                                        ca.argv[ 0 ] += STRLENOF( "rwm-" );
@@ -2248,7 +2249,8 @@ rwm_cf_gen( ConfigArgs *c )
 
                                        ca.line = rwmap->rwm_bva_map[ cnt ].bv_val;
                                        ca.argc = 0;
-                                       config_fp_parse_line( &ca );
+                                       init_config_argv( &ca );
+                                       config_parse_ldif( &ca );
                                        
                                        argv[1] = ca.argv[0];
                                        argv[2] = ca.argv[1];
@@ -2342,7 +2344,8 @@ rwm_cf_gen( ConfigArgs *c )
 
                                ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
                                ca.argc = 0;
-                               config_fp_parse_line( &ca );
+                               init_config_argv( &ca );
+                               config_parse_ldif( &ca );
 
                                argv0 = ca.argv[ 0 ];
                                ca.argv[ 0 ] += STRLENOF( "rwm-" );
@@ -2392,7 +2395,8 @@ rwm_cf_gen( ConfigArgs *c )
 
                                ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
                                ca.argc = 0;
-                               config_fp_parse_line( &ca );
+                               init_config_argv( &ca );
+                               config_parse_ldif( &ca );
                                
                                argv0 = ca.argv[ 0 ];
                                ca.argv[ 0 ] += STRLENOF( "rwm-" );
@@ -2491,7 +2495,8 @@ rwm_cf_gen( ConfigArgs *c )
 
                                ca.line = rwmap->rwm_bva_map[ cnt ].bv_val;
                                ca.argc = 0;
-                               config_fp_parse_line( &ca );
+                               init_config_argv( &ca );
+                               config_parse_ldif( &ca );
 
                                argv[1] = ca.argv[0];
                                argv[2] = ca.argv[1];
@@ -2524,7 +2529,8 @@ rwm_cf_gen( ConfigArgs *c )
 
                                        ca.line = rwmap->rwm_bva_map[ cnt ].bv_val;
                                        ca.argc = 0;
-                                       config_fp_parse_line( &ca );
+                                       init_config_argv( &ca );
+                                       config_parse_ldif( &ca );
                        
                                        argv[1] = ca.argv[0];
                                        argv[2] = ca.argv[1];