Commit c1583643 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix to ITS#5513

parent 44d088c9
OpenLDAP 2.4 Change Log OpenLDAP 2.4 Change Log
OpenLDAP 2.4.10 Engineering OpenLDAP 2.4.10 Engineering
Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
OpenLDAP 2.4.9 Release (2008/05/07) OpenLDAP 2.4.9 Release (2008/05/07)
Fixed libldap to use unsigned port (ITS#5436) Fixed libldap to use unsigned port (ITS#5436)
......
...@@ -773,8 +773,9 @@ ldap_back_entry_get( ...@@ -773,8 +773,9 @@ ldap_back_entry_get(
ldapinfo_t *li = (ldapinfo_t *) op->o_bd->be_private; ldapinfo_t *li = (ldapinfo_t *) op->o_bd->be_private;
ldapconn_t *lc = NULL; ldapconn_t *lc = NULL;
int rc = 1, int rc,
do_not_cache; do_not_cache;
ber_tag_t tag;
struct berval bdn; struct berval bdn;
LDAPMessage *result = NULL, LDAPMessage *result = NULL,
*e = NULL; *e = NULL;
...@@ -788,12 +789,18 @@ ldap_back_entry_get( ...@@ -788,12 +789,18 @@ ldap_back_entry_get(
/* Tell getconn this is a privileged op */ /* Tell getconn this is a privileged op */
do_not_cache = op->o_do_not_cache; do_not_cache = op->o_do_not_cache;
tag = op->o_tag;
/* do not cache */
op->o_do_not_cache = 1; op->o_do_not_cache = 1;
if ( !ldap_back_dobind( &lc, op, &rs, LDAP_BACK_DONTSEND ) ) { /* ldap_back_entry_get() is an entry lookup, so it does not need
op->o_do_not_cache = do_not_cache; * 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; return rs.sr_err;
} }
op->o_do_not_cache = do_not_cache;
if ( at ) { if ( at ) {
attrp = attr; attrp = attr;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment