diff options
author | Noriko Hosoi <nhosoi@redhat.com> | 2009-07-30 10:34:21 -0700 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2009-08-12 12:47:34 -0600 |
commit | 355fcd10ed59734dad74ca6cd7be7c3d542735f7 (patch) | |
tree | d2c3b4e1242d187122b9943470ad5361458e1e56 /ldap/servers | |
parent | a712d8db742a612e9006c4f32c317b45f02c2ff8 (diff) | |
download | ds-355fcd10ed59734dad74ca6cd7be7c3d542735f7.tar.gz ds-355fcd10ed59734dad74ca6cd7be7c3d542735f7.tar.xz ds-355fcd10ed59734dad74ca6cd7be7c3d542735f7.zip |
514770 remove per-entry response control for GER and Paged Results
Since per entry-response controls are ignored by the ldapsearch client,
we are getting rid of the unnecessary write_controls calls for Simple Paged
Results and GER.
Diffstat (limited to 'ldap/servers')
-rw-r--r-- | ldap/servers/slapd/result.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/ldap/servers/slapd/result.c b/ldap/servers/slapd/result.c index 2884d11b..b085965d 100644 --- a/ldap/servers/slapd/result.c +++ b/ldap/servers/slapd/result.c @@ -1370,36 +1370,6 @@ send_ldap_search_entry_ext( if ( searchctrlp != NULL ) { rc = write_controls( ber, searchctrlp ); } - /* - * The get-effective-rights control is called within - * the current function. Hence it can't be already in - * searchctrlp - */ - if ( operation->o_flags & OP_FLAG_GET_EFFECTIVE_RIGHTS ) { - LDAPControl *gerctrl[2]; - slapi_pblock_get (pb, SLAPI_RESCONTROLS, &ctrlp); - for ( i = 0; ctrlp != NULL && ctrlp[i] != NULL; i++ ) { - if (strcmp(ctrlp[i]->ldctl_oid, LDAP_CONTROL_GET_EFFECTIVE_RIGHTS ) == 0 ) { - gerctrl[0] = ctrlp[i]; - gerctrl[1] = NULL; - rc = write_controls( ber, gerctrl ); - break; - } - } - } - if ( operation->o_flags & OP_FLAG_PAGED_RESULTS ) { - LDAPControl *pagedctrl[2]; - slapi_pblock_get (pb, SLAPI_RESCONTROLS, &ctrlp); - for ( i = 0; ctrlp != NULL && ctrlp[i] != NULL; i++ ) { - if (strcmp(ctrlp[i]->ldctl_oid, LDAP_CONTROL_PAGEDRESULTS ) - == 0 ) { - pagedctrl[0] = ctrlp[i]; - pagedctrl[1] = NULL; - rc = write_controls( ber, pagedctrl ); - break; - } - } - } } if ( rc != -1 ) { |