upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

import fix to ITS#5513

Browse source
This commit is contained in:
Pierangelo Masarati 2008-05-18 11:25:45 +00:00
parent 92d4b77dea
commit 3bc1ff4e80
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,5 +1,8 @@
OpenLDAP 2.3 Change Log
OpenLDAP 2.3.43 Engineering
Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
OpenLDAP 2.3.42 Release (2008/05/15)
Fixed slapd abstract objectClass inheritance check (ITS#5474)
Fixed slapd connection handling (ITS#5469)

15
servers/slapd/back-ldap/search.c
View file

@ -795,8 +795,9 @@ ldap_back_entry_get(
ldapinfo_t *li = (ldapinfo_t *) op->o_bd->be_private;
ldapconn_t *lc = NULL;
int rc = 1,
int rc,
do_not_cache;
ber_tag_t tag;
struct berval bdn;
LDAPMessage *result = NULL,
*e = NULL;
@ -810,12 +811,18 @@ ldap_back_entry_get(
/* Tell getconn this is a privileged op */
do_not_cache = op->o_do_not_cache;
tag = op->o_tag;
/* do not cache */
op->o_do_not_cache = 1;
if ( !ldap_back_dobind( &lc, op, &rs, LDAP_BACK_DONTSEND ) ) {
op->o_do_not_cache = do_not_cache;
/* ldap_back_entry_get() is an entry lookup, so it does not need
* to know what the entry is being looked up for */
op->o_tag = LDAP_REQ_SEARCH;
rc = ldap_back_dobind( &lc, op, &rs, LDAP_BACK_DONTSEND );
op->o_do_not_cache = do_not_cache;
op->o_tag = tag;
if ( !rc ) {
return rs.sr_err;
}
op->o_do_not_cache = do_not_cache;
if ( at ) {
attrp = attr;