mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

All text messages to be returned with LDAPv2 search results when

Browse Source 
no referrals need to be returned.
This commit is contained in:
Kurt Zeilenga 1999-10-25 00:00:23 +00:00
parent 06eb390586
commit 92238e52ae
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/result.c
View File

@ -450,9 +450,10 @@ send_search_result(
} }
tmp = v2ref( refs ); tmp = v2ref( refs );
text = tmp;
refs = NULL; refs = NULL;
if( tmp != NULL ) text = tmp;
} else { } else {
/* don't send references in search results */ /* don't send references in search results */
assert( refs == NULL ); assert( refs == NULL );
@ -503,7 +504,6 @@ send_search_entry(
BerElement *ber; BerElement *ber;
Attribute *a; Attribute *a;
int i, rc=-1, bytes; int i, rc=-1, bytes;
AccessControl *acl;
char *edn; char *edn;
int userattrs; int userattrs;
int opattrs; int opattrs;
@ -549,8 +549,6 @@ send_search_entry(
: charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES ); : charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES );
for ( a = e->e_attrs; a != NULL; a = a->a_next ) { for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
regmatch_t matches[MAXREMATCHES];
if ( attrs == NULL ) { if ( attrs == NULL ) {
/* all addrs request, skip operational attributes */ /* all addrs request, skip operational attributes */
if( !opattrs && oc_check_operational_attr( a->a_type ) ) { if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
@ -625,8 +623,6 @@ send_search_entry(
a = backend_subschemasubentry( be ); a = backend_subschemasubentry( be );
do { do {
regmatch_t matches[MAXREMATCHES];
if ( attrs == NULL ) { if ( attrs == NULL ) {
/* all addrs request, skip operational attributes */ /* all addrs request, skip operational attributes */
if( !opattrs && oc_check_operational_attr( a->a_type ) ) { if( !opattrs && oc_check_operational_attr( a->a_type ) ) {