Add BDB_INDEX error handling

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 1b26ee117f3b41e94f8b01992fc0835398df8a3d..105e95b75cdf803408475df0b23cc30d9c4a2504 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -33,6 +33,9 @@
 #ifdef SLAPD_META
 #include "back-meta/external.h"
 #endif
+#ifdef SLAPD_MONITOR
+#include "back-monitor/external.h"
+#endif
 #ifdef SLAPD_PASSWD
 #include "back-passwd/external.h"
 #endif
@@ -68,6 +71,9 @@ static BackendInfo binfo[] = {
 #if defined(SLAPD_META) && !defined(SLAPD_META_DYNAMIC)
        {"meta",        meta_back_initialize},
 #endif
+#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC)
+       {"monitor",     monitor_back_initialize},
+#endif
 #if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC)
        {"passwd",      passwd_back_initialize},
 #endif
@@ -463,8 +469,7 @@ backend_db_init(
        be = &backends[nbackends++];
 
        be->bd_info = bi;
-       be->be_sizelimit = defsize;
-       be->be_timelimit = deftime;
+       be->be_def_limit = deflimit;
        be->be_dfltaccess = global_default_access;
 
        be->be_restrictops = global_restrictops;
@@ -520,7 +525,7 @@ select_backend(
                        }
 
                        
-                       if ( (len < dnlen) && !(DN_SEPARATOR( dn[(dnlen-len)-1] )) ) {
+                       if ( len && len < dnlen && !DN_SEPARATOR( dn[(dnlen-len)-1] ) ) {
                                /* make sure we have a separator */
                                continue;
                        }