From HEAD:

	Fixed slapd syncprov/glue interaction issue (ITS#4323)

diff --git a/CHANGES b/CHANGES
index aaa3b52c74615b8d0126d7ec7c67773552c1b184..e7efd9294f58d62aebd4896ba70e618cfa9a0f6b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,15 +6,16 @@ OpenLDAP 2.3.21 Engineering
        Fixed libldap invalid free bug (ITS#4436)
        Fixed libldap mutex leak (ITS#4441)
        Fixed libldap_r thr_yield(2) return handling (ITS#4469)
+       Fixed slapd syncprov/glue interaction issue (ITS#4323)
+       Fixed slapd operational attrs in presence of global overlays (ITS#4431)
+       Fixed slapd connection cleanup (ITS#4465)
        Fixed slapd-ldbm crash on modify bug (ITS#4464)
        Fixed slapd-ldap potential bind deadlock (ITS#4409)
-       Fixed slapd-ldap/slapd-meta conn expiration concurrency (ITS#4429)
+       Fixed slapd-ldap/meta conn expiration concurrency (ITS#4429)
        Fixed slapd-ldap failed bind connection trashing (ITS#4428)
-       Fixed slapd-ldap/slapd-meta chase-referrals disabling (ITS#4447)
+       Fixed slapd-ldap/meta chase-referrals disabling (ITS#4447)
        Fixed slapd-ldap controls forwarding (ITS#4457)
        Fixed slapd-ldap pretty DN in proxied requests (ITS#4456)
-       Fixed slapd operational attrs in presence of global overlays (ITS#4431)
-       Fixed slapd connection cleanup (ITS#4465)
        Build Environment
                Fixed multi-precision sizeof detection (ITS#4416)
                Updated libtool to version 1.5.22 (ITS#4471)

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index e05412f46281d1f68d62bde080d68c241d9ae773..e2fa8a2ff85b2d12cc356d97ad641b820d3072ab 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -93,6 +93,7 @@ glue_op_response ( Operation *op, SlapReply *rs )
        switch(rs->sr_type) {
        case REP_SEARCH:
        case REP_SEARCHREF:
+       case REP_INTERMEDIATE:
                return SLAP_CB_CONTINUE;
 
        default: