Commit 5c429c8f authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5328

parent 72bba9f8
......@@ -25,6 +25,7 @@ OpenLDAP 2.4.17 Engineering
Fixed slapd-hdb freeing of already freed entries (ITS#6074)
Fixed slapd-hdb entryinfo cleanup (ITS#6088)
Fixed slapd-hdb dncache lockups (ITS#6095)
Fixed slapd-relay to return failure on failure (ITS#5328)
Fixed slapd-sql with BACKSQL_ARBITRARY_KEY defined (ITS#6100)
Added slapo-rwm rwm-drop-unrequested-attrs config option (ITS#6057)
Fixed slapo-rwm dn passing (ITS#6070)
......
......@@ -457,15 +457,14 @@ relay_back_has_subordinates( Operation *op, Entry *e, int *hasSubs )
{
SlapReply rs = { 0 };
BackendDB *bd;
int rc = 1;
int rc = LDAP_OTHER;
bd = relay_back_select_backend( op, &rs,
( LDAP_SUCCESS | RB_ERR ) );
bd = relay_back_select_backend( op, &rs, LDAP_OTHER );
/* FIXME: this test only works if there are no overlays, so
* it is nearly useless; if made stricter, no nested back-relays
* can be instantiated... too bad. */
if ( bd == NULL || bd == op->o_bd ) {
return 0;
return LDAP_OTHER;
}
if ( bd->be_has_subordinates ) {
......@@ -477,7 +476,6 @@ relay_back_has_subordinates( Operation *op, Entry *e, int *hasSubs )
}
return rc;
}
int
......
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