Drop unused arguments from syncrepl_add_glue

diff --git a/servers/slapd/back-meta/cache-merge.c b/servers/slapd/back-meta/cache-merge.c
index e6472730ef206b2bec886d8d6015a98e3291852f..38df26fec35d5e209f899a62edf57286446d9576 100644 (file)
--- a/servers/slapd/back-meta/cache-merge.c
+++ b/servers/slapd/back-meta/cache-merge.c
@@ -183,8 +183,7 @@ merge_entry(
                        result->rc = info.added;
                } else if ( rc == LDAP_REFERRAL ||
                                        rc == LDAP_NO_SUCH_OBJECT ) {
-                       slap_entry2mods( e, &modlist, &text );
-                       syncrepl_add_glue( NULL, NULL, &op_tmp, e, modlist, 0, NULL, NULL );
+                       syncrepl_add_glue( &op_tmp, e );
                        result->rc = info.added;
                } else {
                        result->rc = 0;

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 5e9184c230c0cea0728a1ac47597dc81c603ff36..04112981112bc8dec376606dfada5798bd9b2300 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1191,9 +1191,8 @@ LDAP_SLAPD_F (int) syncrepl_entry LDAP_P((
 LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P((
                                        syncinfo_t *, LDAP *, Operation *, struct berval *,
                                        struct berval * ));
-LDAP_SLAPD_F (void)  syncrepl_add_glue LDAP_P(( syncinfo_t *, LDAP *,
-                                       Operation*, Entry*, Modifications*, int,
-                                       struct berval*, struct berval* ));
+LDAP_SLAPD_F (void)  syncrepl_add_glue LDAP_P(( 
+                                       Operation*, Entry* ));
 LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P((
                                        Backend *, struct berval *,
                                        struct berval *, struct berval * ));

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 9501ef1b998ad4cb4a2a91bcdce614921300b1b7..79d99e40a7fb07d3b14b2e939465d1b4808bad0b 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -959,9 +959,7 @@ syncrepl_entry(
                                        ret = 1;
                                        goto done;
                                } else if ( rc == LDAP_REFERRAL || rc == LDAP_NO_SUCH_OBJECT ) {
-                                       syncrepl_add_glue( si, ld, op, e,
-                                               modlist, syncstate,
-                                               syncUUID, syncCookie);
+                                       syncrepl_add_glue( op, e );
                                        si->si_e = NULL;
                                        ret = 0;
                                        goto done;
@@ -1098,14 +1096,8 @@ static struct berval gcbva[] = {
 
 void
 syncrepl_add_glue(
-       syncinfo_t *si,
-       LDAP *ld,
        Operation* op,
-       Entry *e,
-       Modifications* modlist,
-       int syncstate,
-       struct berval* syncUUID,
-       struct berval* syncCookie
+       Entry *e
 )
 {
        Backend *be = op->o_bd;
@@ -1123,7 +1115,7 @@ syncrepl_add_glue(
        op->o_tag = LDAP_REQ_ADD;
        op->o_callback = &cb;
        cb.sc_response = null_callback;
-       cb.sc_private = si;
+       cb.sc_private = NULL;
 
        dn = e->e_name;
        ndn = e->e_nname;