ITS#5328

diff --git a/CHANGES b/CHANGES
index 11eeee96c045aa9b91a2c89a21e5b644ea138d2d..c8e861cd7002108b20bc7b3950ebf9834014c646 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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)

diff --git a/servers/slapd/back-relay/op.c b/servers/slapd/back-relay/op.c
index 4c28483d92a6c711aa6d569730adaf2acf93eb8d..11d20beef7a4d42b63d11c5e0bd69fde72afe23b 100644 (file)
--- a/servers/slapd/back-relay/op.c
+++ b/servers/slapd/back-relay/op.c
@@ -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