upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 23:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop unused arguments from syncrepl_add_glue

Browse source
This commit is contained in:
Howard Chu 2003-10-24 08:10:16 +00:00
parent f9a8093c83
commit 645c2bcb02
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/slapd/back-meta/cache-merge.c
View file

@ -183,8 +183,7 @@ merge_entry(
result->rc = info.added; result->rc = info.added;
} else if ( rc == LDAP_REFERRAL || } else if ( rc == LDAP_REFERRAL ||
rc == LDAP_NO_SUCH_OBJECT ) { rc == LDAP_NO_SUCH_OBJECT ) {
slap_entry2mods( e, &modlist, &text ); syncrepl_add_glue( &op_tmp, e );
syncrepl_add_glue( NULL, NULL, &op_tmp, e, modlist, 0, NULL, NULL );
result->rc = info.added; result->rc = info.added;
} else { } else {
result->rc = 0; result->rc = 0;

5
servers/slapd/proto-slap.h
View file

@ -1191,9 +1191,8 @@ LDAP_SLAPD_F (int) syncrepl_entry LDAP_P((
LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P(( LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P((
syncinfo_t *, LDAP *, Operation *, struct berval *, syncinfo_t *, LDAP *, Operation *, struct berval *,
struct berval * )); struct berval * ));
LDAP_SLAPD_F (void) syncrepl_add_glue LDAP_P(( syncinfo_t *, LDAP *, LDAP_SLAPD_F (void) syncrepl_add_glue LDAP_P((
Operation*, Entry*, Modifications*, int, Operation*, Entry* ));
struct berval*, struct berval* ));
LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P(( LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P((
Backend *, struct berval *, Backend *, struct berval *,
struct berval *, struct berval * )); struct berval *, struct berval * ));

14
servers/slapd/syncrepl.c
View file

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