Fix "*" op-attr search

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 514a0724e8fa14a2c08242ab2b31a1d5130e932b..26f2af95baf12a56144333321377f6cd82859f36 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -545,8 +545,7 @@ send_search_entry(
        }
 
        /* check for special all user attributes ("*") attribute */
-       allattrs = attrs == NULL
-               ? 1
+       allattrs = ( attrs == NULL ) ? 1
                : charray_inlist( attrs, LDAP_ALL_USER_ATTRIBUTES );
 
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
@@ -560,7 +559,17 @@ send_search_entry(
 
                } else {
                        /* specific addrs requested */
-                       if ( !allattrs && !charray_inlist( attrs, a->a_type ) ) {
+                       if ( allattrs ) {
+                               /* user requested all user attributes */
+                               /* if operational, make sure it's in list */
+
+                               if( oc_check_operational_attr( a->a_type )
+                                       && !charray_inlist( attrs, a->a_type ) )
+                               {
+                                       continue;
+                               }
+
+                       } else if ( !charray_inlist( attrs, a->a_type ) ) {
                                continue;
                        }
                }