allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index d1e89c6f91d7a39684a7846ef6ef571691b80988..9761bdfbfcd8abb7cd39d8dd825c4da17d05716d 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 #include "lber_pvt.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static struct berval supportedFeatures[] = {
@@ -119,7 +119,12 @@ root_dse_info(
        }
 
        for ( i = 0; i < nbackends; i++ ) {
-               if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+               if ( backends[i].be_suffix == NULL
+                               || backends[i].be_nsuffix == NULL ) {
+                       /* no suffix! */
+                       continue;
+               }
+               if ( SLAP_MONITOR( &backends[i] )) {
                        vals[0] = backends[i].be_suffix[0];
                        nvals[0] = backends[i].be_nsuffix[0];
                        if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {