Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / back-monitor / database.c

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 3d772d699fd5b820c86bcf1c8dba6fa75b4d6acc..b75a7149f75642d5e5146c598693ce5953cc67ae 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2013 The OpenLDAP Foundation.
+ * Copyright 2001-2015 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -216,6 +216,14 @@ monitor_subsys_database_init_one(
 
        bi = be->bd_info;
 
+       if ( be->be_suffix == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "monitor_subsys_database_init_one: "
+                       "missing suffix for %s\n",
+                       rdnval, 0, 0 );
+               return( -1 );
+       }
+
        if ( overlay_is_over( be ) ) {
                oi = (slap_overinfo *)be->bd_info->bi_private;
                bi = oi->oi_orig;
@@ -245,17 +253,10 @@ monitor_subsys_database_init_one(
                                be->be_suffix, be->be_nsuffix );
 
        } else {
-               if ( be->be_suffix == NULL ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "monitor_subsys_database_init_one: "
-                               "missing suffix for %s\n",
-                               rdnval, 0, 0 );
-               } else {
-                       attr_merge( e, slap_schema.si_ad_namingContexts,
-                               be->be_suffix, NULL );
-                       attr_merge( e_database, slap_schema.si_ad_namingContexts,
-                               be->be_suffix, NULL );
-               }
+               attr_merge( e, slap_schema.si_ad_namingContexts,
+                       be->be_suffix, NULL );
+               attr_merge( e_database, slap_schema.si_ad_namingContexts,
+                       be->be_suffix, NULL );
 
                if ( SLAP_GLUE_SUBORDINATE( be ) ) {
                        BackendDB *sup_be = select_backend( &be->be_nsuffix[ 0 ], 1 );