diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2009-07-30 10:34:21 -0700 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2009-07-30 10:34:21 -0700 |
| commit | 7a4fce4d5e9d194962eeb7c7c780376a3b5ed130 (patch) | |
| tree | 8c5a5c39cb716196beaaec62149538247e0faec1 | |
| parent | 7c52ad591180095b747f08c92a1550d76c9e9532 (diff) | |
| download | ds-7a4fce4d5e9d194962eeb7c7c780376a3b5ed130.tar.gz ds-7a4fce4d5e9d194962eeb7c7c780376a3b5ed130.tar.xz ds-7a4fce4d5e9d194962eeb7c7c780376a3b5ed130.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.
| -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 ) { |