X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyncrepl.c;h=c2a757a4e467d2702c4740adda569dae87e257e4;hb=0a5f1e8516d386784ed7f605e5d03c7ee6d7cedd;hp=733e2e2e4e6f9bcb23accb4789f71ab0a302dd3a;hpb=ce4b199485de98e563c58e6b7318af3d6dfba06f;p=openldap
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 733e2e2e4e..c2a757a4e4 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1,33 +1,19 @@
+/* syncrepl.c -- Replication Engine which uses the LDAP Sync protocol */
/* $OpenLDAP$ */
-/*
- * Replication Engine which uses the LDAP Sync protocol
- */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* Copyright (c) 2003 by International Business Machines, Inc.
+/* This work is part of OpenLDAP Software .
*
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-/* Modified by Howard Chu
+ * Copyright 2003 The OpenLDAP Foundation.
+ * Portions Copyright 2003 by IBM Corporation.
+ * Portions Copyright 2003 by Howard Chu, Symas Corporation.
+ * All rights reserved.
*
- * Copyright (c) 2003 by Howard Chu, Symas Corporation
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * Modifications provided under the terms of the OpenLDAP public license.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -44,18 +30,15 @@
#include "ldap_rq.h"
-#ifdef LDAP_SLAPI
-#include "slapi.h"
-#endif
-
#define SYNCREPL_STR "syncreplxxx"
#define CN_STR "cn="
static const struct berval slap_syncrepl_bvc = BER_BVC(SYNCREPL_STR);
static const struct berval slap_syncrepl_cn_bvc = BER_BVC(CN_STR SYNCREPL_STR);
-static void
-syncrepl_del_nonpresent( LDAP *, Operation *, syncinfo_t * );
+static int syncuuid_cmp( const void *, const void * );
+static void avl_ber_bvfree( void * );
+static void syncrepl_del_nonpresent( Operation *, syncinfo_t * );
/* callback functions */
static int dn_callback( struct slap_op *, struct slap_rep * );
@@ -129,22 +112,24 @@ init_syncrepl(syncinfo_t *si)
static int
ldap_sync_search(
syncinfo_t *si,
- LDAP *ld,
- void *ctx,
- int *msgidp )
+ void *ctx
+)
{
BerElementBuffer berbuf;
BerElement *ber = (BerElement *)&berbuf;
LDAPControl c[2], *ctrls[3];
struct timeval timeout;
+ ber_int_t msgid;
int rc;
/* setup LDAP SYNC control */
ber_init2( ber, NULL, LBER_USE_DER );
ber_set_option( ber, LBER_OPT_BER_MEMCTX, &ctx );
- if ( si->si_syncCookie ) {
- ber_printf( ber, "{eO}", abs(si->si_type), si->si_syncCookie );
+ if ( si->si_syncCookie.octet_str &&
+ si->si_syncCookie.octet_str[0].bv_val ) {
+ ber_printf( ber, "{eO}", abs(si->si_type),
+ &si->si_syncCookie.octet_str[0] );
} else {
ber_printf( ber, "{e}", abs(si->si_type) );
}
@@ -171,10 +156,10 @@ ldap_sync_search(
timeout.tv_sec = si->si_tlimit > 0 ? si->si_tlimit : 1;
timeout.tv_usec = 0;
- rc = ldap_search_ext( ld, si->si_base.bv_val, si->si_scope,
+ rc = ldap_search_ext( si->si_ld, si->si_base.bv_val, si->si_scope,
si->si_filterstr.bv_val, si->si_attrs, si->si_attrsonly,
ctrls, NULL, si->si_tlimit < 0 ? NULL : &timeout,
- si->si_slimit, msgidp );
+ si->si_slimit, &msgid );
ber_free_buf( ber );
return rc;
@@ -182,108 +167,48 @@ ldap_sync_search(
static const Listener dummy_list = { {0, ""}, {0, ""} };
-void *
-do_syncrepl(
- void *ctx,
- void *arg )
+static int
+do_syncrep1(
+ Operation *op,
+ syncinfo_t *si )
{
- struct re_s* rtask = arg;
- syncinfo_t *si = ( syncinfo_t * ) rtask->arg;
- Backend *be;
-
- LDAPControl **rctrls = NULL;
- LDAPControl *rctrlp = NULL;
-
- BerElement *res_ber = NULL;
-
- LDAP *ld = NULL;
- LDAPMessage *res = NULL;
- LDAPMessage *msg = NULL;
-
- ber_int_t msgid;
-
- char *retoid = NULL;
- struct berval *retdata = NULL;
-
- int sync_info_arrived = 0;
- Entry *entry = NULL;
-
- int syncstate;
- struct berval syncUUID = { 0, NULL };
- struct berval syncCookie = { 0, NULL };
- struct berval syncCookie_req = { 0, NULL };
-
int rc;
- int err;
- ber_len_t len;
- int syncinfo_arrived = 0;
-
- Connection conn = {0};
- Operation op = {0};
- slap_callback cb;
-
- void *memctx = NULL;
- ber_len_t memsiz;
-
- int rc_efree;
-
- struct berval psub = { 0, NULL };
- Modifications *modlist = NULL;
+ int cmdline_cookie_found = 0;
char syncrepl_cbuf[sizeof(CN_STR SYNCREPL_STR)];
struct berval syncrepl_cn_bv;
+ struct sync_cookie *sc = NULL;
+ struct sync_cookie syncCookie = { NULL, -1, NULL };
+ struct berval *psub;
- const char *text;
- int match;
-
- struct timeval *tout_p = NULL;
- struct timeval tout = { 10, 0 };
-
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, DETAIL1, "do_syncrepl\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl\n", 0, 0, 0 );
-#endif
-
- if ( si == NULL )
- return NULL;
-
- switch( abs( si->si_type )) {
- case LDAP_SYNC_REFRESH_ONLY:
- case LDAP_SYNC_REFRESH_AND_PERSIST:
- break;
- default:
- return NULL;
- }
-
- si->si_sync_mode = LDAP_SYNC_STATE_MODE;
+ psub = &si->si_be->be_nsuffix[0];
/* Init connection to master */
- rc = ldap_initialize( &ld, si->si_provideruri );
+ rc = ldap_initialize( &si->si_ld, si->si_provideruri );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
- "do_syncrepl: ldap_initialize failed (%s)\n",
+ "do_syncrep1: ldap_initialize failed (%s)\n",
si->si_provideruri, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "do_syncrepl: ldap_initialize failed (%s)\n",
+ "do_syncrep1: ldap_initialize failed (%s)\n",
si->si_provideruri, 0, 0 );
#endif
- return NULL;
+ return rc;
}
- op.o_protocol = LDAP_VERSION3;
- ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &op.o_protocol );
+ op->o_protocol = LDAP_VERSION3;
+ ldap_set_option( si->si_ld, LDAP_OPT_PROTOCOL_VERSION, &op->o_protocol );
/* Bind to master */
if ( si->si_tls ) {
- rc = ldap_start_tls_s( ld, NULL, NULL );
+ rc = ldap_start_tls_s( si->si_ld, NULL, NULL );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR, "do_syncrepl: "
+ LDAP_LOG ( OPERATION, ERR, "do_syncrep1: "
"%s: ldap_start_tls failed (%d)\n",
si->si_tls == SYNCINFO_TLS_CRITICAL ? "Error" : "Warning",
rc, 0 );
@@ -293,7 +218,7 @@ do_syncrepl(
si->si_tls == SYNCINFO_TLS_CRITICAL ? "Error" : "Warning",
rc, 0 );
#endif
- if( si->si_tls == SYNCINFO_TLS_CRITICAL ) return NULL;
+ if( si->si_tls == SYNCINFO_TLS_CRITICAL ) goto done;
}
}
@@ -302,10 +227,10 @@ do_syncrepl(
void *defaults;
if ( si->si_secprops != NULL ) {
- int err = ldap_set_option( ld,
+ rc = ldap_set_option( si->si_ld,
LDAP_OPT_X_SASL_SECPROPS, si->si_secprops);
- if( err != LDAP_OPT_SUCCESS ) {
+ if( rc != LDAP_OPT_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR, "do_bind: Error: "
"ldap_set_option(%s,SECPROPS,\"%s\") failed!\n",
@@ -315,15 +240,15 @@ do_syncrepl(
"(%s,SECPROPS,\"%s\") failed!\n",
si->si_provideruri, si->si_secprops, 0 );
#endif
- return NULL;
+ goto done;
}
}
- defaults = lutil_sasl_defaults( ld,
+ defaults = lutil_sasl_defaults( si->si_ld,
si->si_saslmech, si->si_realm,
si->si_authcId, si->si_passwd, si->si_authzId );
- rc = ldap_sasl_interactive_bind_s( ld,
+ rc = ldap_sasl_interactive_bind_s( si->si_ld,
si->si_binddn,
si->si_saslmech,
NULL, NULL,
@@ -339,133 +264,265 @@ do_syncrepl(
*/
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR, "do_syncrepl: "
+ LDAP_LOG ( OPERATION, ERR, "do_syncrep1: "
"ldap_sasl_interactive_bind_s failed (%d)\n",
rc, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "do_syncrepl: "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep1: "
"ldap_sasl_interactive_bind_s failed (%d)\n",
rc, 0, 0 );
#endif
- return NULL;
+ goto done;
}
#else /* HAVE_CYRUS_SASL */
+ /* Should never get here, we trapped this at config time */
fprintf( stderr, "not compiled with SASL support\n" );
- return NULL;
+ rc = LDAP_OTHER;
+ goto done;
#endif
} else {
- rc = ldap_bind_s( ld, si->si_binddn, si->si_passwd, si->si_bindmethod );
+ rc = ldap_bind_s( si->si_ld, si->si_binddn, si->si_passwd, si->si_bindmethod );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR, "do_syncrepl: "
+ LDAP_LOG ( OPERATION, ERR, "do_syncrep1: "
"ldap_bind_s failed (%d)\n", rc, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "do_syncrepl: "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep1: "
"ldap_bind_s failed (%d)\n", rc, 0, 0 );
#endif
- return NULL;
+ goto done;
}
}
- /* set thread context in syncinfo */
- si->si_ctx = ctx;
-
- be = si->si_be;
-
- si->si_conn = &conn;
- conn.c_connid = -1;
- conn.c_send_ldap_result = slap_send_ldap_result;
- conn.c_send_search_entry = slap_send_search_entry;
- conn.c_send_search_reference = slap_send_search_reference;
- conn.c_listener = (Listener *)&dummy_list;
- conn.c_peer_name = slap_empty_bv;
-
- /* set memory context */
-#define SLAB_SIZE 1048576
- memsiz = SLAB_SIZE;
- memctx = sl_mem_create( memsiz, ctx );
- op.o_tmpmemctx = memctx;
- op.o_tmpmfuncs = &sl_mfuncs;
-
- op.o_dn = si->si_updatedn;
- op.o_ndn = si->si_updatedn;
- op.o_callback = &cb;
- op.o_time = slap_get_time();
- op.o_threadctx = si->si_ctx;
- op.o_managedsait = 1;
- op.o_bd = be;
- op.o_conn = &conn;
- op.o_connid = op.o_conn->c_connid;
-#if defined( LDAP_SLAPI )
- op.o_pb = slapi_pblock_new();
- slapi_x_create_object_extensions( SLAPI_X_EXT_OPERATION, &op );
-#endif /* defined( LDAP_SLAPI ) */
-
/* get syncrepl cookie of shadow replica from subentry */
- assert( si->si_id < 1000 );
+ assert( si->si_rid < 1000 );
syncrepl_cn_bv.bv_val = syncrepl_cbuf;
syncrepl_cn_bv.bv_len = snprintf(syncrepl_cbuf, sizeof(syncrepl_cbuf),
- CN_STR "syncrepl%d", si->si_id );
- build_new_dn( &op.o_req_ndn, &si->si_base, &syncrepl_cn_bv,
- op.o_tmpmemctx );
- op.o_req_dn = op.o_req_ndn;
+ CN_STR "syncrepl%ld", si->si_rid );
+ build_new_dn( &op->o_req_ndn, psub, &syncrepl_cn_bv, op->o_tmpmemctx );
+ op->o_req_dn = op->o_req_ndn;
- si->si_syncCookie = NULL;
- backend_attribute( &op, NULL, &op.o_req_ndn,
- slap_schema.si_ad_syncreplCookie, &si->si_syncCookie );
+ LDAP_STAILQ_FOREACH( sc, &slap_sync_cookie, sc_next ) {
+ if ( si->si_rid == sc->rid ) {
+ cmdline_cookie_found = 1;
+ break;
+ }
+ }
- ber_dupbv( &syncCookie_req, &si->si_syncCookie[0] );
+ if ( cmdline_cookie_found ) {
+ /* cookie is supplied in the command line */
+ BerVarray cookie = NULL;
+ struct berval cookie_bv;
+
+ LDAP_STAILQ_REMOVE( &slap_sync_cookie, sc, sync_cookie, sc_next );
+ slap_sync_cookie_free( &si->si_syncCookie, 0 );
+
+ /* read stored cookie if it exists */
+ backend_attribute( op, NULL, &op->o_req_ndn,
+ slap_schema.si_ad_syncreplCookie, &cookie );
+
+ if ( !cookie ) {
+ /* no stored cookie */
+ if ( sc->ctxcsn == NULL ||
+ sc->ctxcsn->bv_val == NULL ) {
+ /* if cmdline cookie does not have ctxcsn */
+ /* component, set it to an initial value */
+ slap_init_sync_cookie_ctxcsn( sc );
+ }
+ slap_dup_sync_cookie( &si->si_syncCookie, sc );
+ slap_sync_cookie_free( sc, 1 );
+ sc = NULL;
+ } else {
+ /* stored cookie */
+ struct berval newcookie = { 0, NULL };
+ ber_dupbv( &cookie_bv, &cookie[0] );
+ ber_bvarray_add( &si->si_syncCookie.octet_str, &cookie_bv );
+ slap_parse_sync_cookie( &si->si_syncCookie );
+ ber_bvarray_free( si->si_syncCookie.octet_str );
+ si->si_syncCookie.octet_str = NULL;
+ ber_bvarray_free_x( cookie, op->o_tmpmemctx );
+ if ( sc->sid != -1 ) {
+ /* command line cookie wins */
+ si->si_syncCookie.sid = sc->sid;
+ }
+ if ( sc->ctxcsn != NULL ) {
+ /* command line cookie wins */
+ if ( si->si_syncCookie.ctxcsn ) {
+ ber_bvarray_free( si->si_syncCookie.ctxcsn );
+ si->si_syncCookie.ctxcsn = NULL;
+ }
+ ber_dupbv( &cookie_bv, &sc->ctxcsn[0] );
+ ber_bvarray_add( &si->si_syncCookie.ctxcsn, &cookie_bv );
+ }
+ if ( sc->rid != -1 ) {
+ /* command line cookie wins */
+ si->si_syncCookie.rid = sc->rid;
+ }
+ slap_sync_cookie_free( sc, 1 );
+ sc = NULL;
+ slap_compose_sync_cookie( NULL, &newcookie,
+ &si->si_syncCookie.ctxcsn[0],
+ si->si_syncCookie.sid, si->si_syncCookie.rid );
+ ber_bvarray_add( &si->si_syncCookie.octet_str, &newcookie );
+ }
+ } else {
+ /* no command line cookie is specified */
+ if ( si->si_syncCookie.octet_str == NULL ) {
+ BerVarray cookie = NULL;
+ struct berval cookie_bv;
+ /* try to read stored cookie */
+ backend_attribute( op, NULL, &op->o_req_ndn,
+ slap_schema.si_ad_syncreplCookie, &cookie );
+ if ( cookie ) {
+ ber_dupbv( &cookie_bv, &cookie[0] );
+ ber_bvarray_add( &si->si_syncCookie.octet_str, &cookie_bv );
+ slap_parse_sync_cookie( &si->si_syncCookie );
+ ber_bvarray_free_x( cookie, op->o_tmpmemctx );
+ }
+ }
+ }
- psub = be->be_nsuffix[0];
+ rc = ldap_sync_search( si, op->o_tmpmemctx );
- rc = ldap_sync_search( si, ld, memctx, &msgid );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR, "do_syncrepl: "
+ LDAP_LOG ( OPERATION, ERR, "do_syncrep1: "
"ldap_search_ext: %s (%d)\n", ldap_err2string( rc ), rc, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "do_syncrepl: "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep1: "
"ldap_search_ext: %s (%d)\n", ldap_err2string( rc ), rc, 0 );
#endif
- return NULL;
}
+done:
+ if ( rc ) {
+ if ( si->si_ld ) {
+ ldap_unbind( si->si_ld );
+ si->si_ld = NULL;
+ }
+ }
+
+ return rc;
+}
+
+static int
+do_syncrep2(
+ Operation *op,
+ syncinfo_t *si )
+{
+ LDAPControl **rctrls = NULL;
+ LDAPControl *rctrlp;
+
+ BerElementBuffer berbuf;
+ BerElement *ber = (BerElement *)&berbuf;
+
+ LDAPMessage *res = NULL;
+ LDAPMessage *msg = NULL;
+
+ char *retoid = NULL;
+ struct berval *retdata = NULL;
+
+ Entry *entry = NULL;
+
+ int syncstate;
+ struct berval syncUUID = { 0, NULL };
+ struct sync_cookie syncCookie = { NULL, -1, NULL };
+ struct sync_cookie syncCookie_req = { NULL, -1, NULL };
+ struct berval cookie = { 0, NULL };
+
+ int rc, err, i;
+ ber_len_t len;
+
+ slap_callback cb;
+
+ int rc_efree;
+
+ struct berval *psub;
+ Modifications *modlist = NULL;
+
+ const char *text;
+ int match;
+
+ struct timeval *tout_p = NULL;
+ struct timeval tout = { 0, 0 };
+
+ int refreshDeletes = 0;
+ int refreshDone = 1;
+ BerVarray syncUUIDs = NULL;
+ ber_tag_t si_tag;
+
+ if ( slapd_abrupt_shutdown ) {
+ rc = -2;
+ goto done;
+ }
+
+ ber_init2( ber, NULL, LBER_USE_DER );
+ ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
+
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "do_syncrep2\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=>do_syncrep2\n", 0, 0, 0 );
+#endif
+
+ op->o_callback = &cb;
+
+ psub = &si->si_be->be_nsuffix[0];
+
+ slap_dup_sync_cookie( &syncCookie_req, &si->si_syncCookie );
+
if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST ){
tout_p = &tout;
} else {
tout_p = NULL;
}
- while (( rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ONE, tout_p, &res ))
- >= 0 )
+ while (( rc = ldap_result( si->si_ld, LDAP_RES_ANY, LDAP_MSG_ONE, tout_p, &res ))
+ > 0 )
{
- if ( rc == 0 ) {
- if ( slapd_abrupt_shutdown ) {
- break;
- } else {
- continue;
- }
+ if ( slapd_abrupt_shutdown ) {
+ rc = -2;
+ goto done;
}
-
- for( msg = ldap_first_message( ld, res );
+ for( msg = ldap_first_message( si->si_ld, res );
msg != NULL;
- msg = ldap_next_message( ld, msg ) )
+ msg = ldap_next_message( si->si_ld, msg ) )
{
- syncCookie.bv_len = 0; syncCookie.bv_val = NULL;
switch( ldap_msgtype( msg ) ) {
case LDAP_RES_SEARCH_ENTRY:
- entry = syncrepl_message_to_entry( si, ld, &op, msg,
- &modlist, &syncstate, &syncUUID, &syncCookie );
- rc_efree = syncrepl_entry( si, ld, &op, entry, modlist,
- syncstate, &syncUUID, &syncCookie, !syncinfo_arrived );
- if ( syncCookie.bv_len ) {
- syncrepl_updateCookie( si, ld, &op, &psub, &syncCookie );
+ ldap_get_entry_controls( si->si_ld, msg, &rctrls );
+ /* we can't work without the control */
+ if ( !rctrls ) {
+ rc = -1;
+ goto done;
+ }
+ rctrlp = *rctrls;
+ ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER );
+ ber_scanf( ber, "{em", &syncstate, &syncUUID );
+ if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) {
+ ber_scanf( ber, "m}", &cookie );
+ if ( cookie.bv_val ) {
+ struct berval tmp_bv;
+ ber_dupbv( &tmp_bv, &cookie );
+ ber_bvarray_add( &syncCookie.octet_str, &tmp_bv );
+ }
+ if ( syncCookie.octet_str &&
+ syncCookie.octet_str[0].bv_val )
+ slap_parse_sync_cookie( &syncCookie );
+ }
+ entry = syncrepl_message_to_entry( si, op, msg,
+ &modlist, syncstate );
+ rc_efree = syncrepl_entry( si, op, entry, modlist, syncstate,
+ &syncUUID, &syncCookie_req );
+ if ( syncCookie.octet_str && syncCookie.octet_str[0].bv_val ) {
+ syncrepl_updateCookie( si, op, psub, &syncCookie );
}
+ ldap_controls_free( rctrls );
if ( modlist ) {
slap_mods_free( modlist );
}
- if ( rc_efree ) {
+ if ( rc_efree && entry ) {
entry_free( entry );
}
break;
@@ -473,126 +530,188 @@ do_syncrepl(
case LDAP_RES_SEARCH_REFERENCE:
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
- "do_syncrepl : reference received\n", 0, 0, 0 );
+ "do_syncrep2 : reference received\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "do_syncrepl : reference received\n", 0, 0, 0 );
+ "do_syncrep2 : reference received\n", 0, 0, 0 );
#endif
break;
case LDAP_RES_SEARCH_RESULT:
- ldap_parse_result( ld, msg, &err, NULL, NULL, NULL,
+ ldap_parse_result( si->si_ld, msg, &err, NULL, NULL, NULL,
&rctrls, 0 );
if ( rctrls ) {
- BerElementBuffer berbuf;
- BerElement *ctrl_ber;
rctrlp = *rctrls;
- ctrl_ber = (BerElement *)&berbuf;
- ber_init2( ctrl_ber, &rctrlp->ldctl_value, LBER_USE_DER );
+ ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER );
- ber_scanf( ctrl_ber, "{" /*"}"*/);
- if ( ber_peek_tag( ctrl_ber, &len )
- == LDAP_SYNC_TAG_COOKIE )
+ ber_scanf( ber, "{" /*"}"*/);
+ if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE )
{
- ber_scanf( ctrl_ber, "o", &syncCookie );
+ ber_scanf( ber, "m", &cookie );
+ if ( cookie.bv_val ) {
+ struct berval tmp_bv;
+ ber_dupbv( &tmp_bv, &cookie );
+ ber_bvarray_add( &syncCookie.octet_str, &tmp_bv);
+ }
+ if ( syncCookie.octet_str &&
+ syncCookie.octet_str[0].bv_val )
+ slap_parse_sync_cookie( &syncCookie );
}
- ldap_controls_free( rctrls );
- }
- value_match( &match, slap_schema.si_ad_entryCSN,
- slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
- SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
- &syncCookie_req, &syncCookie, &text );
- if (si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST) {
- /* FIXME : different error behaviors according to
- * 1) err code : LDAP_BUSY ...
- * 2) on err policy : stop service, stop sync, retry
- */
- if ( syncCookie.bv_len && match < 0) {
- syncrepl_updateCookie( si, ld, &op,
- &psub, &syncCookie );
+ if ( ber_peek_tag( ber, &len ) == LDAP_TAG_REFRESHDELETES )
+ {
+ ber_scanf( ber, "b", &refreshDeletes );
}
- goto done;
+ ber_scanf( ber, "}" );
+ }
+ if ( syncCookie_req.ctxcsn == NULL ) {
+ match = -1;
+ } else if ( syncCookie.ctxcsn == NULL ) {
+ match = 1;
} else {
+ value_match( &match, slap_schema.si_ad_entryCSN,
+ slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ &syncCookie_req.ctxcsn[0], &syncCookie.ctxcsn[0], &text );
+ }
+ if ( syncCookie.octet_str && syncCookie.octet_str->bv_val
+ && match < 0 ) {
+ syncrepl_updateCookie( si, op, psub, &syncCookie );
+ }
+ if ( rctrls ) {
+ ldap_controls_free( rctrls );
+ }
+ if (si->si_type != LDAP_SYNC_REFRESH_AND_PERSIST) {
/* FIXME : different error behaviors according to
* 1) err code : LDAP_BUSY ...
* 2) on err policy : stop service, stop sync, retry
*/
- if ( syncCookie.bv_len && match < 0 ) {
- syncrepl_updateCookie( si, ld, &op, &psub, &syncCookie);
- }
- if ( si->si_sync_mode == LDAP_SYNC_STATE_MODE && match
- < 0 )
- {
- syncrepl_del_nonpresent( ld, &op, si );
+ if ( refreshDeletes == 0 && match < 0 ) {
+ syncrepl_del_nonpresent( op, si );
+ } else {
+ avl_free( si->si_presentlist, avl_ber_bvfree );
+ si->si_presentlist = NULL;
}
- goto done;
}
+ rc = -2;
+ goto done;
break;
case LDAP_RES_INTERMEDIATE:
- rc = ldap_parse_intermediate( ld, msg,
+ rc = ldap_parse_intermediate( si->si_ld, msg,
&retoid, &retdata, NULL, 0 );
if ( !rc && !strcmp( retoid, LDAP_SYNC_INFO ) ) {
- sync_info_arrived = 1;
- res_ber = ber_init( retdata );
- ber_scanf( res_ber, "{e" /*"}"*/, &syncstate );
-
- if ( ber_peek_tag( res_ber, &len )
- == LDAP_SYNC_TAG_COOKIE ) {
- ber_scanf( res_ber, /*"{"*/ "o}", &syncCookie );
- } else {
- if ( syncstate == LDAP_SYNC_NEW_COOKIE ) {
+ int si_refreshDelete = 0;
+ int si_refreshPresent = 0;
+ ber_init2( ber, retdata, LBER_USE_DER );
+
+ switch ( si_tag = ber_peek_tag( ber, &len )) {
+ ber_tag_t tag;
+ case LDAP_TAG_SYNC_NEW_COOKIE:
+ ber_scanf( ber, "tm", &tag, &cookie );
+ break;
+ case LDAP_TAG_SYNC_REFRESH_DELETE:
+ si_refreshDelete = 1;
+ case LDAP_TAG_SYNC_REFRESH_PRESENT:
+ si_refreshPresent = 1;
+ ber_scanf( ber, "t{", &tag );
+ if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE )
+ {
+ ber_scanf( ber, "m", &cookie );
+ if ( cookie.bv_val ) {
+ struct berval tmp_bv;
+ ber_dupbv( &tmp_bv, &cookie );
+ ber_bvarray_add( &syncCookie.octet_str, &tmp_bv);
+ }
+ if ( syncCookie.octet_str &&
+ syncCookie.octet_str[0].bv_val )
+ slap_parse_sync_cookie( &syncCookie );
+ }
+ if ( ber_peek_tag( ber, &len ) ==
+ LDAP_TAG_REFRESHDONE )
+ {
+ ber_scanf( ber, "b", &refreshDone );
+ }
+ ber_scanf( ber, "}" );
+ break;
+ case LDAP_TAG_SYNC_ID_SET:
+ ber_scanf( ber, "t{", &tag );
+ if ( ber_peek_tag( ber, &len ) ==
+ LDAP_TAG_SYNC_COOKIE ) {
+ ber_scanf( ber, "m", &cookie );
+ if ( cookie.bv_val ) {
+ struct berval tmp_bv;
+ ber_dupbv( &tmp_bv, &cookie );
+ ber_bvarray_add( &syncCookie.octet_str,
+ &tmp_bv );
+ }
+ if ( syncCookie.octet_str &&
+ syncCookie.octet_str[0].bv_val )
+ slap_parse_sync_cookie( &syncCookie );
+ }
+ if ( ber_peek_tag( ber, &len ) ==
+ LDAP_TAG_REFRESHDELETES )
+ {
+ ber_scanf( ber, "b", &refreshDeletes );
+ }
+ ber_scanf( ber, "[W]", &syncUUIDs );
+ ber_scanf( ber, "}" );
+ for ( i = 0; syncUUIDs[i].bv_val; i++ ) {
+ struct berval *syncuuid_bv;
+ syncuuid_bv = ber_dupbv( NULL, &syncUUIDs[i] );
+ avl_insert( &si->si_presentlist,
+ (caddr_t) syncuuid_bv,
+ syncuuid_cmp, avl_dup_error );
+ }
+ ber_memfree_x( syncUUIDs, op->o_tmpmemctx );
+ break;
+ default:
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_syncrepl : cookie required\n", 0, 0, 0 );
+ LDAP_LOG( OPERATION, ERR,
+ "do_syncrep2 : unknown syncinfo tag (%ld)\n",
+ (long) si_tag, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY,
- "do_syncrepl : cookie required\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "do_syncrep2 : unknown syncinfo tag (%ld)\n",
+ (long) si_tag, 0, 0 );
#endif
- }
+ ldap_memfree( retoid );
+ ber_bvfree( retdata );
+ continue;
}
- value_match( &match, slap_schema.si_ad_entryCSN,
- slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
- SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
- &syncCookie_req, &syncCookie, &text );
+ if ( syncCookie_req.ctxcsn == NULL ) {
+ match = -1;
+ } else if ( syncCookie.ctxcsn == NULL ) {
+ match = 1;
+ } else {
+ value_match( &match, slap_schema.si_ad_entryCSN,
+ slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ &syncCookie_req.ctxcsn[0],
+ &syncCookie.ctxcsn[0], &text );
+ }
- if ( syncCookie.bv_len && match < 0 ) {
- syncrepl_updateCookie( si, ld, &op, &psub, &syncCookie);
+ if ( syncCookie.ctxcsn && syncCookie.ctxcsn[0].bv_val
+ && match < 0 ) {
+ syncrepl_updateCookie( si, op, psub, &syncCookie);
}
- if ( syncstate == LDAP_SYNC_STATE_MODE_DONE ) {
+ if ( si_refreshPresent == 1 ) {
if ( match < 0 ) {
- syncrepl_del_nonpresent( ld, &op, si );
+ syncrepl_del_nonpresent( op, si );
}
- si->si_sync_mode = LDAP_SYNC_LOG_MODE;
- } else if ( syncstate == LDAP_SYNC_LOG_MODE_DONE ) {
- si->si_sync_mode = LDAP_SYNC_PERSIST_MODE;
- } else if ( syncstate == LDAP_SYNC_REFRESH_DONE ) {
- si->si_sync_mode = LDAP_SYNC_PERSIST_MODE;
- } else if ( syncstate != LDAP_SYNC_NEW_COOKIE ||
- syncstate != LDAP_SYNC_LOG_MODE_DONE )
- {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_syncrepl : unknown sync info\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "do_syncrepl : unknown sync info\n", 0, 0, 0 );
-#endif
- }
+ }
ldap_memfree( retoid );
ber_bvfree( retdata );
- ber_free( res_ber, 1 );
break;
} else {
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,"do_syncrepl :"
+ LDAP_LOG( OPERATION, ERR,"do_syncrep2 :"
" unknown intermediate "
"response\n", 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "do_syncrepl : "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep2 : "
"unknown intermediate response (%d)\n",
rc, 0, 0 );
#endif
@@ -603,69 +722,177 @@ do_syncrepl(
break;
default:
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR, "do_syncrepl : "
+ LDAP_LOG( OPERATION, ERR, "do_syncrep2 : "
"unknown message\n", 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "do_syncrepl : "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep2 : "
"unknown message\n", 0, 0, 0 );
#endif
break;
}
- if ( syncCookie.bv_val ) {
- ch_free( syncCookie.bv_val );
- syncCookie.bv_val = NULL;
- }
- if ( syncUUID.bv_val ) {
- ch_free( syncUUID.bv_val );
- syncUUID.bv_val = NULL;
+ if ( syncCookie.octet_str ) {
+ slap_sync_cookie_free( &syncCookie_req, 0 );
+ slap_dup_sync_cookie( &syncCookie_req, &syncCookie );
+ slap_sync_cookie_free( &syncCookie, 0 );
}
}
ldap_msgfree( res );
+ res = NULL;
}
if ( rc == -1 ) {
- int errno;
const char *errstr;
- ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &errno );
- errstr = ldap_err2string( errno );
+ ldap_get_option( si->si_ld, LDAP_OPT_ERROR_NUMBER, &rc );
+ errstr = ldap_err2string( rc );
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
- "do_syncrepl : %s\n", errstr, 0, 0 );
+ "do_syncrep2 : %s\n", errstr, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "do_syncrepl : %s\n", errstr, 0, 0 );
+ "do_syncrep2 : %s\n", errstr, 0, 0 );
#endif
}
done:
-#if defined( LDAP_SLAPI )
- if ( op.o_pb ) slapi_pblock_destroy( op.o_pb );
- slapi_x_free_object_extensions( SLAPI_X_EXT_OPERATION, &op );
-#endif /* defined( LDAP_SLAPI ) */
-
- if ( syncCookie.bv_val )
- ch_free( syncCookie.bv_val );
- if ( syncCookie_req.bv_val )
- ch_free( syncCookie_req.bv_val );
- if ( syncUUID.bv_val )
- ch_free( syncUUID.bv_val );
+ slap_sync_cookie_free( &syncCookie, 0 );
+ slap_sync_cookie_free( &syncCookie_req, 0 );
if ( res ) ldap_msgfree( res );
- ldap_unbind( ld );
+ if ( rc && si->si_ld ) {
+ ldap_unbind( si->si_ld );
+ si->si_ld = NULL;
+ }
+
+ return rc;
+}
+
+void *
+do_syncrepl(
+ void *ctx,
+ void *arg )
+{
+ struct re_s* rtask = arg;
+ syncinfo_t *si = ( syncinfo_t * ) rtask->arg;
+ Connection conn = {0};
+ Operation op = {0};
+ int rc = LDAP_SUCCESS;
+ int first = 0;
+ int dostop = 0;
+ ber_socket_t s;
+
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "do_syncrepl\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl\n", 0, 0, 0 );
+#endif
+
+ if ( si == NULL )
+ return NULL;
+
+ switch( abs( si->si_type )) {
+ case LDAP_SYNC_REFRESH_ONLY:
+ case LDAP_SYNC_REFRESH_AND_PERSIST:
+ break;
+ default:
+ return NULL;
+ }
+
+ if ( slapd_abrupt_shutdown && si->si_ld ) {
+ ldap_get_option( si->si_ld, LDAP_OPT_DESC, &s );
+ connection_client_stop( s );
+ ldap_unbind( si->si_ld );
+ si->si_ld = NULL;
+ return NULL;
+ }
+
+ conn.c_connid = -1;
+ conn.c_send_ldap_result = slap_send_ldap_result;
+ conn.c_send_search_entry = slap_send_search_entry;
+ conn.c_send_search_reference = slap_send_search_reference;
+ conn.c_listener = (Listener *)&dummy_list;
+ conn.c_peer_name = slap_empty_bv;
+
+ /* set memory context */
+#define SLAB_SIZE 1048576
+ op.o_tmpmemctx = sl_mem_create( SLAB_SIZE, ctx );
+ op.o_tmpmfuncs = &sl_mfuncs;
+
+ op.o_dn = si->si_updatedn;
+ op.o_ndn = si->si_updatedn;
+ op.o_time = slap_get_time();
+ op.o_threadctx = ctx;
+ op.o_managedsait = 1;
+ op.o_bd = si->si_be;
+ op.o_conn = &conn;
+ op.o_connid = op.o_conn->c_connid;
+
+ op.o_sync_state.ctxcsn = NULL;
+ op.o_sync_state.sid = -1;
+ op.o_sync_state.octet_str = NULL;
+ op.o_sync_slog_size = -1;
+ LDAP_STAILQ_FIRST( &op.o_sync_slog_list ) = NULL;
+ op.o_sync_slog_list.stqh_last = &LDAP_STAILQ_FIRST(&op.o_sync_slog_list);
+
+ /* Establish session, do search */
+ if ( !si->si_ld ) {
+ first = 1;
+ rc = do_syncrep1( &op, si );
+ }
- ber_bvarray_free_x( si->si_syncCookie, op.o_tmpmemctx );
- si->si_syncCookie = NULL;
+ /* Process results */
+ if ( rc == LDAP_SUCCESS ) {
+ ldap_get_option( si->si_ld, LDAP_OPT_DESC, &s );
+
+ rc = do_syncrep2( &op, si );
+
+ if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST ) {
+ /* If we succeeded, enable the connection for further listening.
+ * If we failed, tear down the connection and reschedule.
+ */
+ if ( rc == LDAP_SUCCESS ) {
+ if ( first ) {
+ rc = connection_client_setup( s, (Listener *)&dummy_list, do_syncrepl,
+ arg );
+ } else {
+ connection_client_enable( s );
+ }
+ } else if ( !first ) {
+ dostop = 1;
+ }
+ } else {
+ if ( rc == -2 ) rc = 0;
+ }
+ }
+ /* At this point, we have 4 cases:
+ * 1) for any hard failure, give up and remove this task
+ * 2) for ServerDown, reschedule this task to run
+ * 3) for Refresh and Success, reschedule to run
+ * 4) for Persist and Success, reschedule to defer
+ */
ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
- ldap_pvt_runqueue_stoptask( &syncrepl_rq, rtask );
- if ( si->si_type == LDAP_SYNC_REFRESH_ONLY ) {
- ldap_pvt_runqueue_resched( &syncrepl_rq, rtask );
- } else {
+ if ( ldap_pvt_runqueue_isrunning( &syncrepl_rq, rtask )) {
+ ldap_pvt_runqueue_stoptask( &syncrepl_rq, rtask );
+ }
+
+ if ( dostop ) {
+ connection_client_stop( s );
+ }
+
+ if ( rc && rc != LDAP_SERVER_DOWN ) {
ldap_pvt_runqueue_remove( &syncrepl_rq, rtask );
+ } else {
+ if ( rc == LDAP_SERVER_DOWN ||
+ si->si_type == LDAP_SYNC_REFRESH_ONLY ) {
+ rc = 0;
+ } else {
+ rc = 1;
+ }
+ ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, rc );
}
ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
@@ -675,13 +902,10 @@ done:
Entry*
syncrepl_message_to_entry(
syncinfo_t *si,
- LDAP *ld,
Operation *op,
LDAPMessage *msg,
Modifications **modlist,
- int *syncstate,
- struct berval *syncUUID,
- struct berval *syncCookie
+ int syncstate
)
{
Entry *e = NULL;
@@ -697,10 +921,6 @@ syncrepl_message_to_entry(
struct berval bdn = {0, NULL}, dn, ndn;
int rc;
- ber_len_t len;
- LDAPControl* rctrlp;
- LDAPControl** rctrls = NULL;
-
*modlist = NULL;
if ( ldap_msgtype( msg ) != LDAP_RES_SEARCH_ENTRY ) {
@@ -716,41 +936,7 @@ syncrepl_message_to_entry(
op->o_tag = LDAP_REQ_ADD;
- rc = ldap_get_entry_controls( ld, msg, &rctrls );
- if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "syncrepl_message_to_entry : control get failed (%d)", rc, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "syncrepl_message_to_entry : control get failed (%d)", rc, 0, 0 );
-#endif
- return NULL;
- }
-
- if ( rctrls ) {
- BerElementBuffer berbuf;
- BerElement *ctrl_ber;
-
- rctrlp = *rctrls;
- ctrl_ber = (BerElement *)&berbuf;
- ber_init2( ctrl_ber, &rctrlp->ldctl_value, LBER_USE_DER );
- ber_scanf( ctrl_ber, "{eo", syncstate, syncUUID );
- if ( ber_peek_tag( ctrl_ber, &len ) == LDAP_SYNC_TAG_COOKIE ) {
- ber_scanf( ctrl_ber, "o}", syncCookie );
- }
- ldap_controls_free( rctrls );
- } else {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,"syncrepl_message_to_entry : "
- " rctrls absent\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry :"
- " rctrls absent\n", 0, 0, 0 );
-#endif
- }
-
- rc = ldap_get_dn_ber( ld, msg, &ber, &bdn );
+ rc = ldap_get_dn_ber( si->si_ld, msg, &ber, &bdn );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
@@ -769,7 +955,8 @@ syncrepl_message_to_entry(
sl_free( ndn.bv_val, op->o_tmpmemctx );
sl_free( dn.bv_val, op->o_tmpmemctx );
- if ( *syncstate == LDAP_SYNC_PRESENT || *syncstate == LDAP_SYNC_DELETE ) {
+ if ( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_DELETE )
+ {
return NULL;
}
@@ -841,38 +1028,30 @@ done:
return e;
}
-int
-syncuuid_cmp( const void* v_uuid1, const void* v_uuid2 )
-{
- const struct berval *uuid1 = v_uuid1;
- const struct berval *uuid2 = v_uuid2;
- int rc = uuid1->bv_len - uuid2->bv_len;
- if ( rc ) return rc;
- return ( strcmp( uuid1->bv_val, uuid2->bv_val ) );
-}
-
int
syncrepl_entry(
syncinfo_t* si,
- LDAP *ld,
Operation *op,
Entry* e,
Modifications* modlist,
int syncstate,
struct berval* syncUUID,
- struct berval* syncCookie,
- int refresh
+ struct sync_cookie* syncCookie_req
)
{
Backend *be = op->o_bd;
slap_callback cb;
struct berval *syncuuid_bv = NULL;
+ struct berval syncUUID_strrep = { 0, NULL };
SlapReply rs = {REP_RESULT};
+ Filter f = {0};
+ AttributeAssertion ava = {0};
int rc = LDAP_SUCCESS;
+ int ret = LDAP_SUCCESS;
+ const char *text;
- if ( refresh &&
- ( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_ADD ))
+ if (( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_ADD ))
{
syncuuid_bv = ber_dupbv( NULL, syncUUID );
avl_insert( &si->si_presentlist, (caddr_t) syncuuid_bv,
@@ -883,6 +1062,13 @@ syncrepl_entry(
return e ? 1 : 0;
}
+ f.f_choice = LDAP_FILTER_EQUALITY;
+ f.f_ava = &ava;
+ ava.aa_desc = slap_schema.si_ad_entryUUID;
+ slap_uuidstr_from_normalized( &syncUUID_strrep, syncUUID, op->o_tmpmemctx );
+ ava.aa_value = *syncUUID;
+ op->ors_filter = &f;
+
op->ors_filterstr.bv_len = (sizeof("entryUUID=")-1) + syncUUID->bv_len;
op->ors_filterstr.bv_val = (char *) sl_malloc(
op->ors_filterstr.bv_len + 1, op->o_tmpmemctx );
@@ -891,10 +1077,6 @@ syncrepl_entry(
syncUUID->bv_val, syncUUID->bv_len );
op->ors_filterstr.bv_val[op->ors_filterstr.bv_len] = '\0';
- si->si_e = e;
- si->si_syncUUID_ndn = NULL;
-
- op->ors_filter = str2filter_x( op, op->ors_filterstr.bv_val );
op->ors_scope = LDAP_SCOPE_SUBTREE;
/* get syncrepl cookie of shadow replica from subentry */
@@ -906,11 +1088,10 @@ syncrepl_entry(
cb.sc_response = dn_callback;
cb.sc_private = si;
- si->si_syncUUID_ndn = NULL;
+ si->si_syncUUID_ndn.bv_val = NULL;
rc = be->be_search( op, &rs );
- if ( op->ors_filter ) filter_free_x( op, op->ors_filter );
if ( op->ors_filterstr.bv_val ) {
sl_free( op->ors_filterstr.bv_val, op->o_tmpmemctx );
}
@@ -918,17 +1099,26 @@ syncrepl_entry(
cb.sc_response = null_callback;
cb.sc_private = si;
- if ( rc == LDAP_SUCCESS && si->si_syncUUID_ndn &&
- si->si_sync_mode != LDAP_SYNC_LOG_MODE )
+ if ( rc == LDAP_SUCCESS && si->si_syncUUID_ndn.bv_val )
{
- op->o_req_dn = *si->si_syncUUID_ndn;
- op->o_req_ndn = *si->si_syncUUID_ndn;
+ char *subseq_ptr;
+
+ if ( syncstate != LDAP_SYNC_DELETE ) {
+ op->o_no_psearch = 1;
+ }
+
+ ber_dupbv( &op->o_sync_csn, syncCookie_req->ctxcsn );
+ if ( op->o_sync_csn.bv_val ) {
+ subseq_ptr = strstr( op->o_sync_csn.bv_val, "#0000" );
+ subseq_ptr += 4;
+ *subseq_ptr = '1';
+ }
+
+ op->o_req_dn = si->si_syncUUID_ndn;
+ op->o_req_ndn = si->si_syncUUID_ndn;
op->o_tag = LDAP_REQ_DELETE;
rc = be->be_delete( op, &rs );
- }
-
- if ( si->si_syncUUID_ndn ) {
- ber_bvfree( si->si_syncUUID_ndn );
+ op->o_no_psearch = 0;
}
switch ( syncstate ) {
@@ -939,8 +1129,8 @@ syncrepl_entry(
rc == LDAP_NO_SUCH_OBJECT )
{
attr_delete( &e->e_attrs, slap_schema.si_ad_entryUUID );
- attr_merge_normalize_one( e, slap_schema.si_ad_entryUUID,
- syncUUID, op->o_tmpmemctx );
+ attr_merge_one( e, slap_schema.si_ad_entryUUID,
+ syncUUID, &ava.aa_value );
op->o_tag = LDAP_REQ_ADD;
op->ora_e = e;
@@ -955,7 +1145,6 @@ syncrepl_entry(
op->o_req_dn = e->e_name;
op->o_req_ndn = e->e_nname;
rc = be->be_modify( op, &rs );
- si->si_e = NULL;
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
@@ -967,13 +1156,12 @@ syncrepl_entry(
rc, 0, 0 );
#endif
}
- return 1;
+ 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);
- si->si_e = NULL;
- return 0;
+ syncrepl_add_glue( op, e );
+ ret = 0;
+ goto done;
} else {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
@@ -984,13 +1172,13 @@ syncrepl_entry(
"syncrepl_entry : be_add failed (%d)\n",
rc, 0, 0 );
#endif
- si->si_e = NULL;
- return 1;
+ ret = 1;
+ goto done;
}
} else {
- si->si_e = NULL;
be_entry_release_w( op, e );
- return 0;
+ ret = 0;
+ goto done;
}
} else {
#ifdef NEW_LOGGING
@@ -1000,19 +1188,14 @@ syncrepl_entry(
Debug( LDAP_DEBUG_ANY,
"syncrepl_entry : be_search failed (%d)\n", rc, 0, 0 );
#endif
- si->si_e = NULL;
- return 1;
+ ret = 1;
+ goto done;
}
case LDAP_SYNC_DELETE :
- if ( si->si_sync_mode == LDAP_SYNC_LOG_MODE ) {
- op->o_req_dn = *si->si_syncUUID_ndn;
- op->o_req_ndn = *si->si_syncUUID_ndn;
- op->o_tag = LDAP_REQ_DELETE;
- rc = be->be_delete( op, &rs );
- }
- /* Already deleted otherwise */
- return 0;
+ /* Already deleted */
+ ret = 1;
+ goto done;
default :
#ifdef NEW_LOGGING
@@ -1022,13 +1205,23 @@ syncrepl_entry(
Debug( LDAP_DEBUG_ANY,
"syncrepl_entry : unknown syncstate\n", 0, 0, 0 );
#endif
- return 1;
+ ret = 1;
+ goto done;
}
+
+done :
+
+ if ( syncUUID_strrep.bv_val ) {
+ ber_memfree_x( syncUUID_strrep.bv_val, op->o_tmpmemctx );
+ }
+ if ( si->si_syncUUID_ndn.bv_val ) {
+ ber_memfree_x( si->si_syncUUID_ndn.bv_val, op->o_tmpmemctx );
+ }
+ return ret;
}
static void
syncrepl_del_nonpresent(
- LDAP *ld,
Operation *op,
syncinfo_t *si
)
@@ -1093,14 +1286,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;
@@ -1118,7 +1305,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;
@@ -1253,10 +1440,9 @@ static struct berval scbva[] = {
void
syncrepl_updateCookie(
syncinfo_t *si,
- LDAP *ld,
Operation *op,
struct berval *pdn,
- struct berval *syncCookie
+ struct sync_cookie *syncCookie
)
{
Backend *be = op->o_bd;
@@ -1280,16 +1466,8 @@ syncrepl_updateCookie(
slap_callback cb;
SlapReply rs = {REP_RESULT};
- struct berval *dup_syncCookie = NULL;
-
- /* update in memory cookie */
- ber_bvarray_free_x( si->si_syncCookie, op->o_tmpmemctx );
- si->si_syncCookie = NULL;
-
- /* ber_bvarray_add() doesn't have dup option */
- dup_syncCookie = ber_dupbv_x( NULL, syncCookie, op->o_tmpmemctx );
- ber_bvarray_add_x( &si->si_syncCookie, dup_syncCookie, op->o_tmpmemctx );
- op->o_tmpfree( dup_syncCookie, op->o_tmpmemctx );
+ slap_sync_cookie_free( &si->si_syncCookie, 0 );
+ slap_dup_sync_cookie( &si->si_syncCookie, syncCookie );
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
mod->sml_op = LDAP_MOD_REPLACE;
@@ -1300,10 +1478,10 @@ syncrepl_updateCookie(
modtail = &mod->sml_next;
ber_dupbv( &cnbva[0], (struct berval *) &slap_syncrepl_bvc );
- assert( si->si_id < 1000 );
+ assert( si->si_rid < 1000 );
cnbva[0].bv_len = snprintf( cnbva[0].bv_val,
slap_syncrepl_bvc.bv_len,
- "syncrepl%d", si->si_id );
+ "syncrepl%ld", si->si_rid );
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
mod->sml_op = LDAP_MOD_REPLACE;
mod->sml_desc = slap_schema.si_ad_cn;
@@ -1313,7 +1491,7 @@ syncrepl_updateCookie(
modtail = &mod->sml_next;
if ( scbva[0].bv_val ) ch_free( scbva[0].bv_val );
- ber_dupbv( &scbva[0], &si->si_syncCookie[0] );
+ ber_dupbv( &scbva[0], &si->si_syncCookie.octet_str[0] );
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
mod->sml_op = LDAP_MOD_REPLACE;
mod->sml_desc = slap_schema.si_ad_syncreplCookie;
@@ -1353,10 +1531,10 @@ syncrepl_updateCookie(
e = ( Entry * ) ch_calloc( 1, sizeof( Entry ));
slap_syncrepl_cn_bv.bv_val = syncrepl_cbuf;
- assert( si->si_id < 1000 );
+ assert( si->si_rid < 1000 );
slap_syncrepl_cn_bv.bv_len = snprintf( slap_syncrepl_cn_bv.bv_val,
slap_syncrepl_cn_bvc.bv_len,
- "cn=syncrepl%d", si->si_id );
+ "cn=syncrepl%ld", si->si_rid );
build_new_dn( &slap_syncrepl_dn_bv, pdn, &slap_syncrepl_cn_bv,
op->o_tmpmemctx );
@@ -1468,18 +1646,6 @@ done :
return;
}
-void
-avl_ber_bvfree( void *bv )
-{
- if( bv == NULL ) {
- return;
- }
- if ( ((struct berval *)bv)->bv_val != NULL ) {
- ch_free ( ((struct berval *)bv)->bv_val );
- }
- ch_free ( (char *) bv );
-}
-
static int
dn_callback(
Operation* op,
@@ -1489,7 +1655,7 @@ dn_callback(
syncinfo_t *si = op->o_callback->sc_private;
if ( rs->sr_type == REP_SEARCH ) {
- if ( si->si_syncUUID_ndn != NULL ) {
+ if ( si->si_syncUUID_ndn.bv_val != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"dn_callback : multiple entries match dn\n", 0, 0, 0 );
@@ -1498,11 +1664,7 @@ dn_callback(
"dn_callback : multiple entries match dn\n", 0, 0, 0 );
#endif
} else {
- if ( rs->sr_entry == NULL ) {
- si->si_syncUUID_ndn = NULL;
- } else {
- si->si_syncUUID_ndn = ber_dupbv( NULL, &rs->sr_entry->e_nname );
- }
+ ber_dupbv_x( &si->si_syncUUID_ndn, &rs->sr_entry->e_nname, op->o_tmpmemctx );
}
}
@@ -1609,3 +1771,83 @@ slap_create_syncrepl_entry(
return e;
}
+
+struct berval *
+slap_uuidstr_from_normalized(
+ struct berval* uuidstr,
+ struct berval* normalized,
+ void *ctx )
+{
+ struct berval *new;
+ unsigned char nibble;
+ int i, d = 0;
+
+ if ( normalized == NULL )
+ return NULL;
+
+ if ( normalized->bv_len != 16 ) {
+ return NULL;
+ }
+
+ if ( uuidstr ) {
+ new = uuidstr;
+ } else {
+ new = (struct berval *)sl_malloc( sizeof(struct berval), ctx );
+ }
+
+ new->bv_len = 36;
+
+ if (( new->bv_val = sl_malloc( new->bv_len + 1, ctx )) == NULL) {
+ if ( !uuidstr )
+ sl_free( new, ctx );
+ return NULL;
+ }
+
+ for ( i = 0; i < 16; i++ ) {
+ if ( i == 4 || i == 6 || i == 8 || i == 10 ) {
+ new->bv_val[(i<<1)+d] = '-';
+ d += 1;
+ }
+
+ nibble = (normalized->bv_val[i] >> 4) & 0xF;
+ if ( nibble < 10 ) {
+ new->bv_val[(i<<1)+d] = nibble + '0';
+ } else {
+ new->bv_val[(i<<1)+d] = nibble - 10 + 'a';
+ }
+
+ nibble = (normalized->bv_val[i]) & 0xF;
+ if ( nibble < 10 ) {
+ new->bv_val[(i<<1)+d+1] = nibble + '0';
+ } else {
+ new->bv_val[(i<<1)+d+1] = nibble - 10 + 'a';
+ }
+ }
+
+ new->bv_val[new->bv_len] = '\0';
+
+ return new;
+}
+
+static int
+syncuuid_cmp( const void* v_uuid1, const void* v_uuid2 )
+{
+ const struct berval *uuid1 = v_uuid1;
+ const struct berval *uuid2 = v_uuid2;
+ int rc = uuid1->bv_len - uuid2->bv_len;
+ if ( rc ) return rc;
+ return ( strcmp( uuid1->bv_val, uuid2->bv_val ) );
+}
+
+static void
+avl_ber_bvfree( void *bv )
+{
+ if( bv == NULL ) {
+ return;
+ }
+ if ( ((struct berval *)bv)->bv_val != NULL ) {
+ ch_free ( ((struct berval *)bv)->bv_val );
+ }
+ ch_free ( (char *) bv );
+}
+