mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
All text messages to be returned with LDAPv2 search results when
no referrals need to be returned.
This commit is contained in:
parent
06eb390586
commit
92238e52ae
@ -450,9 +450,10 @@ send_search_result(
|
||||
}
|
||||
|
||||
tmp = v2ref( refs );
|
||||
text = tmp;
|
||||
refs = NULL;
|
||||
|
||||
if( tmp != NULL ) text = tmp;
|
||||
|
||||
} else {
|
||||
/* don't send references in search results */
|
||||
assert( refs == NULL );
|
||||
@ -503,7 +504,6 @@ send_search_entry(
|
||||
BerElement *ber;
|
||||
Attribute *a;
|
||||
int i, rc=-1, bytes;
|
||||
AccessControl *acl;
|
||||
char *edn;
|
||||
int userattrs;
|
||||
int opattrs;
|
||||
@ -549,8 +549,6 @@ send_search_entry(
|
||||
: charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES );
|
||||
|
||||
for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
|
||||
regmatch_t matches[MAXREMATCHES];
|
||||
|
||||
if ( attrs == NULL ) {
|
||||
/* all addrs request, skip operational attributes */
|
||||
if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
|
||||
@ -625,8 +623,6 @@ send_search_entry(
|
||||
a = backend_subschemasubentry( be );
|
||||
|
||||
do {
|
||||
regmatch_t matches[MAXREMATCHES];
|
||||
|
||||
if ( attrs == NULL ) {
|
||||
/* all addrs request, skip operational attributes */
|
||||
if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
|
||||
|
Loading…
Reference in New Issue
Block a user