ITS#9647 Treat glue entries as missing

We're using MANAGE_DSAIT control so we get to see them, but they don't
really exist (except for their CSN sometimes).

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 75ef1ae4a7a3e7b68fadf8d247b5446d1f8a3fbb..e60884d7e063632ee1da4856420f860d01d81176 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1411,7 +1411,8 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                        }
                }
 
-               if ( fc.fscope ) {
+               rc = LDAP_COMPARE_FALSE;
+               if ( !is_entry_glue( e ) && fc.fscope ) {
                        ldap_pvt_thread_mutex_lock( &ss->s_mutex );
                        op2 = *ss->s_op;
                        oh = *op->o_hdr;
@@ -2949,6 +2950,9 @@ syncprov_search_response( Operation *op, SlapReply *rs )
                                "bogus referral in context\n", op->o_log_prefix );
                        return SLAP_CB_CONTINUE;
                }
+               if ( is_entry_glue( rs->sr_entry ) ) {
+                       return LDAP_SUCCESS;
+               }
                a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN );
                if ( a == NULL && rs->sr_operational_attrs != NULL ) {
                        a = attr_find( rs->sr_operational_attrs, slap_schema.si_ad_entryCSN );

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 4600f50bce13fc7374ffde472bf9850b22bc0511..9f72b33bcc8a98f8a5eb2f9b30d908b529c2cf6e 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -5719,6 +5719,10 @@ nonpresent_callback(
                        if ( a == NULL ) return 0;
                }
 
+               if ( is_entry_glue( rs->sr_entry ) ) {
+                       return LDAP_SUCCESS;
+               }
+
                if ( present_uuid == NULL ) {
                        int covered = 1; /* covered by our new contextCSN? */