ITS#2888 don't return LDAP_SIZELIMIT_EXCEEDED prematurely

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

diff --git a/servers/slapd/overlays/rwmconf.c b/servers/slapd/overlays/rwmconf.c
index 6f5812e69ac019179d3890f11032b9cc81c1b169..93d9c72fb8262c570db93cebec4e305b8cc9c599 100644 (file)
--- a/servers/slapd/overlays/rwmconf.c
+++ b/servers/slapd/overlays/rwmconf.c
@@ -23,6 +23,8 @@
 
 #include "portable.h"
 
+#ifdef SLAPD_OVER_RWM
+
 #include <stdio.h>
 
 #include <ac/string.h>
@@ -159,8 +161,8 @@ rwm_map_config(
                }
        }
 
-       if ( (src[0] != '\0' && avl_find( map->map, (caddr_t)mapping, mapping_cmp ) != NULL)
-                       || avl_find( map->remap, (caddr_t)&mapping[1], mapping_cmp ) != NULL)
+       if ( (src[0] != '\0' && avl_find( map->map, (caddr_t)mapping, rwm_mapping_cmp ) != NULL)
+                       || avl_find( map->remap, (caddr_t)&mapping[1], rwm_mapping_cmp ) != NULL)
        {
                fprintf( stderr,
                        "%s: line %d: duplicate mapping found (ignored)\n",
@@ -171,10 +173,10 @@ rwm_map_config(
 
        if ( src[0] != '\0' ) {
                avl_insert( &map->map, (caddr_t)mapping,
-                                       mapping_cmp, mapping_dup );
+                                       rwm_mapping_cmp, rwm_mapping_dup );
        }
        avl_insert( &map->remap, (caddr_t)&mapping[1],
-                               mapping_cmp, mapping_dup );
+                               rwm_mapping_cmp, rwm_mapping_dup );
 
        return 0;
 
@@ -190,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;
@@ -220,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;
@@ -239,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,
@@ -261,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 );
@@ -275,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 );
@@ -300,3 +302,5 @@ suffix_massage_config(
        return 0;
 }
 #endif /* ENABLE_REWRITE */
+
+#endif /* SLAPD_OVER_RWM */