Change 'unsigned long len' to ber_len_t in get_filter()

[openldap] / servers / slapd / configinfo.c

diff --git a/servers/slapd/configinfo.c b/servers/slapd/configinfo.c
index 4d85b2b62764c17f89be0c2741433165f2ed821d..565a606647e6a7fa7fe1929bd8383b0c2e9cb666 100644 (file)
--- a/servers/slapd/configinfo.c
+++ b/servers/slapd/configinfo.c
@@ -27,7 +27,11 @@
  */
 
 void
-config_info( Connection *conn, Operation *op )
+config_info(
+       Connection *conn,
+       Operation *op,
+       char **attrs,
+       int attrsonly )
 {
        Entry           *e;
        char            buf[BUFSIZ];
@@ -42,9 +46,24 @@ config_info( Connection *conn, Operation *op )
 
        e->e_attrs = NULL;
        e->e_dn = ch_strdup( SLAPD_CONFIG_DN );
-       e->e_ndn = dn_normalize_case( ch_strdup( SLAPD_CONFIG_DN ));
+       e->e_ndn = ch_strdup( SLAPD_CONFIG_DN );
+       (void) dn_normalize_case( e->e_ndn );
        e->e_private = NULL;
 
+       {
+               char *rdn = ch_strdup( SLAPD_CONFIG_DN );
+               val.bv_val = strchr( rdn, '=' );
+
+               if( val.bv_val != NULL ) {
+                       *val.bv_val = '\0';
+                       val.bv_len = strlen( ++val.bv_val );
+
+                       attr_merge( e, rdn, vals );
+               }
+
+               free( rdn );
+       }
+
        for ( i = 0; i < nbackends; i++ ) {
                strcpy( buf, backends[i].be_type );
                for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
@@ -56,8 +75,16 @@ config_info( Connection *conn, Operation *op )
                attr_merge( e, "database", vals );
        }
 
+       val.bv_val = "top";
+       val.bv_len = sizeof("top")-1;
+       attr_merge( e, "objectClass", vals );
+
+       val.bv_val = "extenisbleObject";
+       val.bv_len = sizeof("extenisbleObject")-1;
+       attr_merge( e, "objectClass", vals );
+
        send_search_entry( &backends[0], conn, op, e,
-               NULL, 0, 1, NULL );
+               attrs, attrsonly, NULL );
        send_search_result( conn, op, LDAP_SUCCESS,
                NULL, NULL, NULL, NULL, 1 );