upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-29 11:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix "*" op-attr search

Browse source
This commit is contained in:
Kurt Zeilenga 1999-07-22 20:19:18 +00:00
parent 766b78765f
commit 983f43785b
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/result.c
View file

@ -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;
}
}