make names unique, since back-ldap/back-meta still have/use suffix_massage* routines

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 6a52a4df81f3d35e0fb5efadec05c90454711cd4..97fb002006176b7d7e89cc29a0341b9742c6b02d 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -428,7 +428,7 @@ rwm_suffixmassage_config(
         * The suffix massaging is emulated 
         * by means of the rewrite capabilities
         */
-       rc = suffix_massage_config( rwmap->rwm_rw,
+       rc = rwm_suffix_massage_config( rwmap->rwm_rw,
                        &pvnc, &nvnc, &prnc, &nrnc );
        free( nvnc.bv_val );
        free( pvnc.bv_val );

diff --git a/servers/slapd/overlays/rwm.h b/servers/slapd/overlays/rwm.h
index 9c17b198e9a06dc3a70ba1fc706c82f4237b19c4..7a9829e172b5e183bed4444fab52259745535929 100644 (file)
--- a/servers/slapd/overlays/rwm.h
+++ b/servers/slapd/overlays/rwm.h
@@ -122,12 +122,12 @@ rwm_filter_map_rewrite(
 
 /* suffix massaging by means of librewrite */
 #ifdef ENABLE_REWRITE
-extern int suffix_massage_config( struct rewrite_info *info,
+extern int rwm_suffix_massage_config( struct rewrite_info *info,
                struct berval *pvnc, struct berval *nvnc,
                struct berval *prnc, struct berval *nrnc);
 #endif /* ENABLE_REWRITE */
-extern int ldap_dnattr_rewrite( dncookie *dc, BerVarray a_vals );
-extern int ldap_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
+extern int rwm_dnattr_rewrite( dncookie *dc, BerVarray a_vals );
+extern int rwm_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
 
 LDAP_END_DECL
 

diff --git a/servers/slapd/overlays/rwmconf.c b/servers/slapd/overlays/rwmconf.c
index c0a498f2b6152429b7f37eefdf6c61163b1af96a..03880721e5c02112a1bb2539591a163c4f6fd6d2 100644 (file)
--- a/servers/slapd/overlays/rwmconf.c
+++ b/servers/slapd/overlays/rwmconf.c
@@ -192,7 +192,7 @@ error_return:;
 
 #ifdef ENABLE_REWRITE
 static char *
-suffix_massage_regexize( const char *s )
+rwm_suffix_massage_regexize( const char *s )
 {
        char *res, *ptr;
        const char *p, *r;
@@ -222,7 +222,7 @@ suffix_massage_regexize( const char *s )
 }
 
 static char *
-suffix_massage_patternize( const char *s )
+rwm_suffix_massage_patternize( const char *s )
 {
        ber_len_t       len;
        char            *res;
@@ -241,7 +241,7 @@ suffix_massage_patternize( const char *s )
 }
 
 int
-suffix_massage_config( 
+rwm_suffix_massage_config( 
                struct rewrite_info *info,
                struct berval *pvnc,
                struct berval *nvnc,
@@ -263,8 +263,8 @@ suffix_massage_config(
        rewrite_parse( info, "<suffix massage>", ++line, 2, rargv );
 
        rargv[ 0 ] = "rewriteRule";
-       rargv[ 1 ] = suffix_massage_regexize( pvnc->bv_val );
-       rargv[ 2 ] = suffix_massage_patternize( prnc->bv_val );
+       rargv[ 1 ] = rwm_suffix_massage_regexize( pvnc->bv_val );
+       rargv[ 2 ] = rwm_suffix_massage_patternize( prnc->bv_val );
        rargv[ 3 ] = ":";
        rargv[ 4 ] = NULL;
        rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
@@ -277,8 +277,8 @@ suffix_massage_config(
        rewrite_parse( info, "<suffix massage>", ++line, 2, rargv );
        
        rargv[ 0 ] = "rewriteRule";
-       rargv[ 1 ] = suffix_massage_regexize( prnc->bv_val );
-       rargv[ 2 ] = suffix_massage_patternize( pvnc->bv_val );
+       rargv[ 1 ] = rwm_suffix_massage_regexize( prnc->bv_val );
+       rargv[ 2 ] = rwm_suffix_massage_patternize( pvnc->bv_val );
        rargv[ 3 ] = ":";
        rargv[ 4 ] = NULL;
        rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );

diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index f80f2774ec8527e166ce878a60f039fc0d6ae669..16fbbe549b83e7a44e786d552489c8ea11b78b4f 100644 (file)
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -470,7 +470,7 @@ rwm_filter_map_rewrite(
  * routines may be macros with args
  */
 int
-ldap_dnattr_rewrite(
+rwm_dnattr_rewrite(
        dncookie                *dc,
        BerVarray               a_vals
 )
@@ -512,7 +512,7 @@ ldap_dnattr_rewrite(
 }
 
 int
-ldap_dnattr_result_rewrite(
+rwm_dnattr_result_rewrite(
        dncookie                *dc,
        BerVarray               a_vals
 )