Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / librewrite / config.c

diff --git a/libraries/librewrite/config.c b/libraries/librewrite/config.c
index da33b467a5ff3173c7e4d79b2ad5ba2797c0ee94..c542f5759caed5ad9888d53a98481d1cfe972d6a 100644 (file)
--- a/libraries/librewrite/config.c
+++ b/libraries/librewrite/config.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -104,19 +104,33 @@ rewrite_parse(
                        return -1;
                }
 
-               info->li_max_passes = atoi( argv[ 1 ] );
+               if ( lutil_atoi( &info->li_max_passes, argv[ 1 ] ) != 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                                       "[%s:%d] unable to parse rewriteMaxPasses=\"%s\"\n",
+                                       fname, lineno, argv[ 1 ] );
+                       return -1;
+               }
+
                if ( info->li_max_passes <= 0 ) {
                        Debug( LDAP_DEBUG_ANY,
-                                       "[%s:%d] negative or null rewriteMaxPasses'\n",
+                                       "[%s:%d] negative or null rewriteMaxPasses\n",
                                        fname, lineno, 0 );
+                       return -1;
                }
 
                if ( argc > 2 ) {
-                       info->li_max_passes_per_rule = atoi( argv[ 2 ] );
+                       if ( lutil_atoi( &info->li_max_passes_per_rule, argv[ 2 ] ) != 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                               "[%s:%d] unable to parse rewriteMaxPassesPerRule=\"%s\"\n",
+                                               fname, lineno, argv[ 2 ] );
+                               return -1;
+                       }
+
                        if ( info->li_max_passes_per_rule <= 0 ) {
                                Debug( LDAP_DEBUG_ANY,
-                                               "[%s:%d] negative or null rewriteMaxPassesPerRule'\n",
+                                               "[%s:%d] negative or null rewriteMaxPassesPerRule\n",
                                                fname, lineno, 0 );
+                               return -1;
                        }
 
                } else {
@@ -399,8 +413,8 @@ rewrite_parse_builtin_map(
        /*
         * Built-in ldap map
         */
-       if ( strcasecmp( argv[ MAP_TYPE ], "ldap" ) == 0 ) {
-               map->lb_type = REWRITE_BUILTIN_MAP_LDAP;
+       if (( map->lb_mapper = rewrite_mapper_find( argv[ MAP_TYPE ] ))) {
+               map->lb_type = REWRITE_BUILTIN_MAP;
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
                if ( ldap_pvt_thread_mutex_init( & map->lb_mutex ) ) {
@@ -410,13 +424,14 @@ rewrite_parse_builtin_map(
                }
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
                
-               map->lb_private = map_ldap_parse( info, fname, lineno,
+               map->lb_private = map->lb_mapper->rm_config( fname, lineno,
                                argc - 3, argv + 3 );
                
        /* 
         * Error
         */     
        } else {
+               free( map );
                Debug( LDAP_DEBUG_ANY, "[%s:%d] unknown map type\n%s",
                                fname, lineno, "" );
                return -1;