(Partial) Sync with HEAD

[openldap] / libraries / librewrite / config.c

diff --git a/libraries/librewrite/config.c b/libraries/librewrite/config.c
index 9cf3ad98dc45f6c5f2de29fb0d647ba464567398..da33b467a5ff3173c7e4d79b2ad5ba2797c0ee94 100644 (file)
--- a/libraries/librewrite/config.c
+++ b/libraries/librewrite/config.c
@@ -39,7 +39,7 @@ rewrite_parse_builtin_map(
  * lines handled are of the form:
  *
  *      rewriteEngine          {on|off}
- *      rewriteMaxPasses        numPasses
+ *      rewriteMaxPasses        numPasses [numPassesPerRule]
  *      rewriteContext                 contextName [alias aliasedContextName]
  *      rewriteRule            pattern substPattern [ruleFlags]
  *      rewriteMap             mapType mapName [mapArgs]
@@ -103,7 +103,25 @@ rewrite_parse(
                                        fname, lineno, "" );
                        return -1;
                }
+
                info->li_max_passes = atoi( argv[ 1 ] );
+               if ( info->li_max_passes <= 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                                       "[%s:%d] negative or null rewriteMaxPasses'\n",
+                                       fname, lineno, 0 );
+               }
+
+               if ( argc > 2 ) {
+                       info->li_max_passes_per_rule = atoi( argv[ 2 ] );
+                       if ( info->li_max_passes_per_rule <= 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                               "[%s:%d] negative or null rewriteMaxPassesPerRule'\n",
+                                               fname, lineno, 0 );
+                       }
+
+               } else {
+                       info->li_max_passes_per_rule = info->li_max_passes;
+               }
                rc = REWRITE_SUCCESS;
        
        /*