Minor cleanup (coverity)

This commit is contained in:
Howard Chu 2015-01-14 12:23:19 +00:00
parent 86d81fa153
commit 0677f67d29

View File

@ -216,6 +216,14 @@ monitor_subsys_database_init_one(
bi = be->bd_info; 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 ) ) { if ( overlay_is_over( be ) ) {
oi = (slap_overinfo *)be->bd_info->bi_private; oi = (slap_overinfo *)be->bd_info->bi_private;
bi = oi->oi_orig; bi = oi->oi_orig;
@ -245,17 +253,10 @@ monitor_subsys_database_init_one(
be->be_suffix, be->be_nsuffix ); be->be_suffix, be->be_nsuffix );
} else { } else {
if ( be->be_suffix == NULL ) { attr_merge( e, slap_schema.si_ad_namingContexts,
Debug( LDAP_DEBUG_ANY, be->be_suffix, NULL );
"monitor_subsys_database_init_one: " attr_merge( e_database, slap_schema.si_ad_namingContexts,
"missing suffix for %s\n", be->be_suffix, NULL );
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 );
}
if ( SLAP_GLUE_SUBORDINATE( be ) ) { if ( SLAP_GLUE_SUBORDINATE( be ) ) {
BackendDB *sup_be = select_backend( &be->be_nsuffix[ 0 ], 1 ); BackendDB *sup_be = select_backend( &be->be_nsuffix[ 0 ], 1 );