Support attribute types list and only parameters on cn=config

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 15a28162f3ccf9d7ebc90855b8aa1625e9cb4d82..4871d23ced86e48b139365bf4f4bf1e9807a1684 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -190,6 +190,7 @@ send_search_entry(
        int             i, rc, bytes, sd;
        struct acl      *acl;
        char            *edn;
+       int allattrs;
 
        Debug( LDAP_DEBUG_TRACE, "=> send_search_entry (%s)\n", e->e_dn, 0, 0 );
 
@@ -235,10 +236,12 @@ send_search_entry(
                goto error_return;
        }
 
+       allattrs = ( (attrs == NULL) || charray_inlist( attrs, "*" ) );
+
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
                regmatch_t       matches[MAXREMATCHES];
 
-               if ( attrs != NULL && ! charray_inlist( attrs, a->a_type ) ) {
+               if ( !allattrs && !charray_inlist( attrs, a->a_type ) ) {
                        continue;
                }