X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyncrepl.c;h=f0fac417fb7b4c9a8184b9221fac843911ca7da4;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=ea3da5f929513ec5e2990d86f6fd69234fc3e842;hpb=33442d7ced3aca0577d6b5c3314038eb963a7ad4;p=openldap diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index ea3da5f929..f0fac417fb 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -23,7 +23,6 @@ #include #include -#include "ldap_pvt.h" #include "lutil.h" #include "slap.h" #include "lutil_ldap.h" @@ -52,8 +51,9 @@ struct runqueue_s syncrepl_rq; void init_syncrepl(syncinfo_t *si) { - int i, j, k, n; - char **tmp; + int i, j, k, l, n; + char **attrs, **exattrs; + ObjectClass *oc; if ( !sync_descs[0] ) { sync_descs[0] = slap_schema.si_ad_objectClass; @@ -62,58 +62,163 @@ init_syncrepl(syncinfo_t *si) sync_descs[3] = NULL; } - for ( n = 0; si->si_attrs[ n ] != NULL; n++ ) /* empty */; - - if ( n ) { - /* Delete Attributes */ - for ( i = 0; sync_descs[i] != NULL; i++ ) { - for ( j = 0; si->si_attrs[j] != NULL; j++ ) { - if ( strcmp( si->si_attrs[j], sync_descs[i]->ad_cname.bv_val ) - == 0 ) - { - ch_free( si->si_attrs[j] ); - for ( k = j; si->si_attrs[k] != NULL; k++ ) { - si->si_attrs[k] = si->si_attrs[k+1]; + if ( si->si_allattrs && si->si_allopattrs ) + attrs = NULL; + else + attrs = anlist2attrs( si->si_anlist ); + + if ( attrs ) { + if ( si->si_allattrs ) { + i = 0; + while ( attrs[i] ) { + if ( !is_at_operational( at_find( attrs[i] ))) { + for ( j = i; attrs[j] != NULL; j++ ) { + if ( j == i ) + ch_free( attrs[i] ); + attrs[j] = attrs[j+1]; + } + } else { + i++; + } + } + attrs = ( char ** ) ch_realloc( attrs, (i + 2)*sizeof( char * ) ); + attrs[i] = ch_strdup("*"); + attrs[i + 1] = NULL; + + } else if ( si->si_allopattrs ) { + i = 0; + while ( attrs[i] ) { + if ( is_at_operational( at_find( attrs[i] ))) { + for ( j = i; attrs[j] != NULL; j++ ) { + if ( j == i ) + ch_free( attrs[i] ); + attrs[j] = attrs[j+1]; } + } else { + i++; } } + attrs = ( char ** ) ch_realloc( attrs, (i + 2)*sizeof( char * ) ); + attrs[i] = ch_strdup("+"); + attrs[i + 1] = NULL; } - for ( n = 0; si->si_attrs[ n ] != NULL; n++ ) /* empty */; - tmp = ( char ** ) ch_realloc( si->si_attrs, (n + 4)*sizeof( char * )); - if ( tmp == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, "out of memory\n", 0,0,0 ); -#else - Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 ); -#endif + + if ( !si->si_allopattrs ) { + for ( i = 0; sync_descs[i] != NULL; i++ ) { + j = 0; + while ( attrs[j] ) { + if ( !strcmp( attrs[j], sync_descs[i]->ad_cname.bv_val )) { + for ( k = j; attrs[k] != NULL; k++ ) { + if ( k == j ) + ch_free( attrs[k] ); + attrs[k] = attrs[k+1]; + } + } else { + j++; + } + } + + } + for ( n = 0; attrs[ n ] != NULL; n++ ) /* empty */; + attrs = ( char ** ) ch_realloc( attrs, (n + 4)*sizeof( char * )); + if ( attrs == NULL ) { + Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 ); + } + + /* Add Attributes */ + for ( i = 0; sync_descs[ i ] != NULL; i++ ) { + attrs[ n++ ] = ch_strdup ( sync_descs[i]->ad_cname.bv_val ); + } + attrs[ n ] = NULL; } + } else { - tmp = ( char ** ) ch_realloc( si->si_attrs, 5 * sizeof( char * )); - if ( tmp == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, "out of memory\n", 0,0,0 ); -#else - Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 ); -#endif + for ( n = 0; sync_descs[ n ] != NULL; n++ ) ; + + attrs = ( char ** ) ch_malloc(( + (si->si_allattrs ? 1 : ( si->si_allopattrs ? 0 : 1)) + + (si->si_allopattrs ? 1 : ( si->si_allattrs ? n : 1)) + + 1 ) * sizeof( char * ) ); + if ( attrs == NULL ) { + Debug( LDAP_DEBUG_ANY, "out of memory\n", 0, 0, 0 ); + } + + i = 0; + if ( si->si_allattrs ) { + attrs[i++] = ch_strdup( "*" ); + } + + if ( si->si_allopattrs ) { + attrs[i++] = ch_strdup( "+" ); + } else { + for ( j = 0; sync_descs[ j ] != NULL; j++ ) { + attrs[ i++ ] = ch_strdup ( sync_descs[j]->ad_cname.bv_val ); + } + } + attrs[i] = NULL; + + if ( !si->si_allattrs && !si->si_allopattrs ) { + attrs[0] = ch_strdup( "*" ); + attrs[1] = ch_strdup( "+" ); + attrs[2] = NULL; } - tmp[ n++ ] = ch_strdup( "*" ); } - si->si_attrs = tmp; + si->si_attrs = attrs; + + exattrs = anlist2attrs( si->si_exanlist ); + + if ( exattrs ) { + for ( n = 0; exattrs[n] != NULL; n++ ) ; + + for ( i = 0; sync_descs[i] != NULL; i++ ) { + j = 0; + while ( exattrs[j] != NULL ) { + if ( !strcmp( exattrs[j], sync_descs[i]->ad_cname.bv_val )) { + for ( k = j; exattrs[k] != NULL; k++ ) { + if ( k == j ) + ch_free( exattrs[k] ); + exattrs[k] = exattrs[k+1]; + } + } else { + j++; + } + } + } + + for ( i = 0; exattrs[i] != NULL; i++ ) { + for ( j = 0; si->si_anlist[j].an_name.bv_val; j++ ) { + if ( oc = si->si_anlist[j].an_oc ) { + k = 0; + while ( oc->soc_required[k] ) { + if ( !strcmp( exattrs[i], + oc->soc_required[k]->sat_cname.bv_val )) { + for ( l = i; exattrs[l]; l++ ) { + if ( l == i ) + ch_free( exattrs[i] ); + exattrs[l] = exattrs[l+1]; + } + } else { + k++; + } + } + } + } + } - /* Add Attributes */ + for ( i = 0; exattrs[i] != NULL; i++ ) ; - for ( i = 0; sync_descs[ i ] != NULL; i++ ) { - si->si_attrs[ n++ ] = ch_strdup ( sync_descs[i]->ad_cname.bv_val ); - si->si_attrs[ n ] = NULL; + if ( i != n ) + exattrs = (char **) ch_realloc( exattrs, (i + 1)*sizeof(char *)); } + + si->si_exattrs = exattrs; } static int ldap_sync_search( syncinfo_t *si, - void *ctx -) + void *ctx ) { BerElementBuffer berbuf; BerElement *ber = (BerElement *)&berbuf; @@ -127,11 +232,14 @@ ldap_sync_search( ber_set_option( ber, LBER_OPT_BER_MEMCTX, &ctx ); 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] ); + !BER_BVISNULL( &si->si_syncCookie.octet_str[0] ) ) + { + ber_printf( ber, "{eO}", + abs(si->si_type), + &si->si_syncCookie.octet_str[0] ); } else { - ber_printf( ber, "{e}", abs(si->si_type) ); + ber_printf( ber, "{e}", + abs(si->si_type) ); } if ( (rc = ber_flatten2( ber, &c[0].ldctl_value, 0 )) == LBER_ERROR ) { @@ -153,20 +261,17 @@ ldap_sync_search( ctrls[1] = NULL; } - timeout.tv_sec = si->si_tlimit > 0 ? si->si_tlimit : 1; + timeout.tv_sec = si->si_tlimit; timeout.tv_usec = 0; 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, + ctrls, NULL, si->si_tlimit > 0 ? &timeout : NULL, si->si_slimit, &msgid ); ber_free_buf( ber ); - return rc; } -static const Listener dummy_list = { {0, ""}, {0, ""} }; - static int do_syncrep1( Operation *op, @@ -180,22 +285,18 @@ do_syncrep1( struct sync_cookie *sc = NULL; struct sync_cookie syncCookie = { NULL, -1, NULL }; struct berval *psub; +#ifdef HAVE_TLS + void *ssl; +#endif psub = &si->si_be->be_nsuffix[0]; /* Init connection to master */ - rc = ldap_initialize( &si->si_ld, si->si_provideruri ); if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "do_syncrep1: ldap_initialize failed (%s)\n", - si->si_provideruri, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep1: ldap_initialize failed (%s)\n", si->si_provideruri, 0, 0 ); -#endif return rc; } @@ -207,17 +308,10 @@ do_syncrep1( if ( si->si_tls ) { rc = ldap_start_tls_s( si->si_ld, NULL, NULL ); if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ERR, "do_syncrep1: " - "%s: ldap_start_tls failed (%d)\n", - si->si_tls == SYNCINFO_TLS_CRITICAL ? "Error" : "Warning", - rc, 0 ); -#else Debug( LDAP_DEBUG_ANY, "%s: ldap_start_tls failed (%d)\n", si->si_tls == SYNCINFO_TLS_CRITICAL ? "Error" : "Warning", rc, 0 ); -#endif if( si->si_tls == SYNCINFO_TLS_CRITICAL ) goto done; } } @@ -231,22 +325,15 @@ do_syncrep1( LDAP_OPT_X_SASL_SECPROPS, si->si_secprops); if( rc != LDAP_OPT_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ERR, "do_bind: Error: " - "ldap_set_option(%s,SECPROPS,\"%s\") failed!\n", - si->si_provideruri, si->si_secprops, 0 ); -#else Debug( LDAP_DEBUG_ANY, "Error: ldap_set_option " "(%s,SECPROPS,\"%s\") failed!\n", si->si_provideruri, si->si_secprops, 0 ); -#endif goto done; } } - defaults = lutil_sasl_defaults( si->si_ld, - si->si_saslmech, si->si_realm, - si->si_authcId, si->si_passwd, si->si_authzId ); + 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( si->si_ld, si->si_binddn, @@ -258,47 +345,62 @@ do_syncrep1( lutil_sasl_freedefs( defaults ); - /* FIXME : different error behaviors according to + /* FIXME: different error behaviors according to * 1) return code * 2) on err policy : exit, retry, backoff ... */ if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ERR, "do_syncrep1: " - "ldap_sasl_interactive_bind_s failed (%d)\n", - rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep1: " "ldap_sasl_interactive_bind_s failed (%d)\n", rc, 0, 0 ); -#endif + + /* FIXME (see above comment) */ + /* if Kerberos credentials cache is not active, retry */ + if ( strcmp( si->si_saslmech, "GSSAPI" ) == 0 && + rc == LDAP_LOCAL_ERROR ) + { + rc = LDAP_SERVER_DOWN; + } + goto done; } #else /* HAVE_CYRUS_SASL */ /* Should never get here, we trapped this at config time */ + assert(0); fprintf( stderr, "not compiled with SASL support\n" ); rc = LDAP_OTHER; goto done; #endif + } else { - rc = ldap_bind_s( si->si_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_syncrep1: " - "ldap_bind_s failed (%d)\n", rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep1: " "ldap_bind_s failed (%d)\n", rc, 0, 0 ); -#endif goto done; } } - /* get syncrepl cookie of shadow replica from subentry */ + /* Set SSF to strongest of TLS, SASL SSFs */ + op->o_sasl_ssf = 0; + op->o_tls_ssf = 0; + op->o_transport_ssf = 0; +#ifdef HAVE_TLS + if ( ldap_get_option( si->si_ld, LDAP_OPT_X_TLS_SSL_CTX, &ssl ) + == LDAP_SUCCESS && ssl != NULL ) + { + op->o_tls_ssf = ldap_pvt_tls_get_strength( ssl ); + } +#endif /* HAVE_TLS */ + ldap_get_option( si->si_ld, LDAP_OPT_X_SASL_SSF, &op->o_sasl_ssf ); + op->o_ssf = ( op->o_sasl_ssf > op->o_tls_ssf ) + ? op->o_sasl_ssf : op->o_tls_ssf; + /* get syncrepl cookie of shadow replica from subentry */ assert( si->si_rid < 1000 ); syncrepl_cn_bv.bv_val = syncrepl_cbuf; - syncrepl_cn_bv.bv_len = snprintf(syncrepl_cbuf, sizeof(syncrepl_cbuf), + syncrepl_cn_bv.bv_len = snprintf( syncrepl_cbuf, sizeof(syncrepl_cbuf), 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; @@ -320,12 +422,12 @@ do_syncrep1( /* read stored cookie if it exists */ backend_attribute( op, NULL, &op->o_req_ndn, - slap_schema.si_ad_syncreplCookie, &cookie ); + slap_schema.si_ad_syncreplCookie, &cookie, ACL_READ ); if ( !cookie ) { /* no stored cookie */ if ( sc->ctxcsn == NULL || - sc->ctxcsn->bv_val == NULL ) { + BER_BVISNULL( sc->ctxcsn ) ) { /* if cmdline cookie does not have ctxcsn */ /* component, set it to an initial value */ slap_init_sync_cookie_ctxcsn( sc ); @@ -333,9 +435,10 @@ do_syncrep1( slap_dup_sync_cookie( &si->si_syncCookie, sc ); slap_sync_cookie_free( sc, 1 ); sc = NULL; + } else { /* stored cookie */ - struct berval newcookie = { 0, NULL }; + struct berval newcookie = BER_BVNULL; ber_dupbv( &cookie_bv, &cookie[0] ); ber_bvarray_add( &si->si_syncCookie.octet_str, &cookie_bv ); slap_parse_sync_cookie( &si->si_syncCookie ); @@ -366,6 +469,7 @@ do_syncrep1( 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 ) { @@ -373,7 +477,7 @@ do_syncrep1( struct berval cookie_bv; /* try to read stored cookie */ backend_attribute( op, NULL, &op->o_req_ndn, - slap_schema.si_ad_syncreplCookie, &cookie ); + slap_schema.si_ad_syncreplCookie, &cookie, ACL_READ ); if ( cookie ) { ber_dupbv( &cookie_bv, &cookie[0] ); ber_bvarray_add( &si->si_syncCookie.octet_str, &cookie_bv ); @@ -386,13 +490,8 @@ do_syncrep1( rc = ldap_sync_search( si, op->o_tmpmemctx ); if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ERR, "do_syncrep1: " - "ldap_search_ext: %s (%d)\n", ldap_err2string( rc ), rc, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep1: " "ldap_search_ext: %s (%d)\n", ldap_err2string( rc ), rc, 0 ); -#endif } done: @@ -403,6 +502,8 @@ done: } } + slap_sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx ); + return rc; } @@ -426,10 +527,10 @@ do_syncrep2( Entry *entry = NULL; int syncstate; - struct berval syncUUID = { 0, NULL }; + struct berval syncUUID = BER_BVNULL; struct sync_cookie syncCookie = { NULL, -1, NULL }; struct sync_cookie syncCookie_req = { NULL, -1, NULL }; - struct berval cookie = { 0, NULL }; + struct berval cookie = BER_BVNULL; int rc, err, i; ber_len_t len; @@ -458,61 +559,63 @@ do_syncrep2( 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 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 ){ + if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST ) { tout_p = &tout; } else { tout_p = NULL; } - while (( rc = ldap_result( si->si_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 ( slapd_shutdown ) { rc = -2; goto done; } for( msg = ldap_first_message( si->si_ld, res ); - msg != NULL; - msg = ldap_next_message( si->si_ld, msg ) ) + msg != NULL; + msg = ldap_next_message( si->si_ld, msg ) ) { switch( ldap_msgtype( msg ) ) { case LDAP_RES_SEARCH_ENTRY: ldap_get_entry_controls( si->si_ld, msg, &rctrls ); /* we can't work without the control */ if ( !rctrls ) { + Debug( LDAP_DEBUG_ANY, "do_syncrep2 : " + "got search entry without " + "control\n", 0, 0, 0 ); rc = -1; goto done; } rctrlp = *rctrls; ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER ); - ber_scanf( ber, "{em", &syncstate, &syncUUID ); + 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 ) { + ber_scanf( ber, /*"{"*/ "m}", &cookie ); + if ( !BER_BVISNULL( &cookie ) ) { 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 ) + !BER_BVISNULL( &syncCookie.octet_str[0] ) ) + { slap_parse_sync_cookie( &syncCookie ); + } } if ( syncrepl_message_to_entry( si, op, msg, &modlist, &entry, syncstate ) == LDAP_SUCCESS ) { rc_efree = syncrepl_entry( si, op, entry, modlist, - syncstate, &syncUUID, &syncCookie_req ); + syncstate, &syncUUID, &syncCookie_req ); if ( syncCookie.octet_str && - syncCookie.octet_str[0].bv_val ) { + !BER_BVISNULL( &syncCookie.octet_str[0] ) ) + { syncrepl_updateCookie( si, op, psub, &syncCookie ); } } @@ -522,18 +625,13 @@ do_syncrep2( } if ( rc_efree && entry ) { entry_free( entry ); - entry = NULL; } + entry = NULL; break; case LDAP_RES_SEARCH_REFERENCE: -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "do_syncrep2 : reference received\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep2 : reference received\n", 0, 0, 0 ); -#endif break; case LDAP_RES_SEARCH_RESULT: @@ -544,23 +642,24 @@ do_syncrep2( ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER ); ber_scanf( ber, "{" /*"}"*/); - if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) - { + if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) { ber_scanf( ber, "m", &cookie ); - if ( cookie.bv_val ) { + if ( !BER_BVISNULL( &cookie ) ) { 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 ) + !BER_BVISNULL( &syncCookie.octet_str[0] ) ) + { slap_parse_sync_cookie( &syncCookie ); + } } if ( ber_peek_tag( ber, &len ) == LDAP_TAG_REFRESHDELETES ) { ber_scanf( ber, "b", &refreshDeletes ); } - ber_scanf( ber, "}" ); + ber_scanf( ber, /*"{"*/ "}" ); } if ( syncCookie_req.ctxcsn == NULL ) { match = -1; @@ -570,10 +669,12 @@ do_syncrep2( 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 ); + &syncCookie_req.ctxcsn[0], &syncCookie.ctxcsn[0], + &text ); } - if ( syncCookie.octet_str && syncCookie.octet_str->bv_val - && match < 0 && err == LDAP_SUCCESS ) { + if ( syncCookie.octet_str && !BER_BVISNULL( syncCookie.octet_str ) && + match < 0 && err == LDAP_SUCCESS ) + { syncrepl_updateCookie( si, op, psub, &syncCookie ); } if ( rctrls ) { @@ -585,7 +686,8 @@ do_syncrep2( * 2) on err policy : stop service, stop sync, retry */ if ( refreshDeletes == 0 && match < 0 && - err == LDAP_SUCCESS ) { + err == LDAP_SUCCESS ) + { syncrepl_del_nonpresent( op, si ); } else { avl_free( si->si_presentlist, avl_ber_bvfree ); @@ -613,67 +715,68 @@ do_syncrep2( si_refreshDelete = 1; case LDAP_TAG_SYNC_REFRESH_PRESENT: si_refreshPresent = 1; - ber_scanf( ber, "t{", &tag ); + ber_scanf( ber, "t{" /*"}"*/, &tag ); if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) { ber_scanf( ber, "m", &cookie ); - if ( cookie.bv_val ) { + if ( !BER_BVISNULL( &cookie ) ) { struct berval tmp_bv; ber_dupbv( &tmp_bv, &cookie ); - ber_bvarray_add( &syncCookie.octet_str, &tmp_bv); + ber_bvarray_add( &syncCookie.octet_str, + &tmp_bv); } if ( syncCookie.octet_str && - syncCookie.octet_str[0].bv_val ) + !BER_BVISNULL( &syncCookie.octet_str[0] ) ) + { slap_parse_sync_cookie( &syncCookie ); + } } if ( ber_peek_tag( ber, &len ) == - LDAP_TAG_REFRESHDONE ) + LDAP_TAG_REFRESHDONE ) { ber_scanf( ber, "b", &refreshDone ); } - ber_scanf( ber, "}" ); + ber_scanf( ber, /*"{"*/ "}" ); break; case LDAP_TAG_SYNC_ID_SET: - ber_scanf( ber, "t{", &tag ); + ber_scanf( ber, "t{" /*"}"*/, &tag ); if ( ber_peek_tag( ber, &len ) == - LDAP_TAG_SYNC_COOKIE ) { + LDAP_TAG_SYNC_COOKIE ) + { ber_scanf( ber, "m", &cookie ); - if ( cookie.bv_val ) { + if ( !BER_BVISNULL( &cookie ) ) { struct berval tmp_bv; ber_dupbv( &tmp_bv, &cookie ); ber_bvarray_add( &syncCookie.octet_str, - &tmp_bv ); + &tmp_bv ); } if ( syncCookie.octet_str && - syncCookie.octet_str[0].bv_val ) + !BER_BVISNULL( &syncCookie.octet_str[0] ) ) + { slap_parse_sync_cookie( &syncCookie ); + } } if ( ber_peek_tag( ber, &len ) == - LDAP_TAG_REFRESHDELETES ) + LDAP_TAG_REFRESHDELETES ) { ber_scanf( ber, "b", &refreshDeletes ); } ber_scanf( ber, "[W]", &syncUUIDs ); - ber_scanf( ber, "}" ); - for ( i = 0; syncUUIDs[i].bv_val; i++ ) { + ber_scanf( ber, /*"{"*/ "}" ); + for ( i = 0; !BER_BVISNULL( &syncUUIDs[i] ); i++ ) { struct berval *syncuuid_bv; syncuuid_bv = ber_dupbv( NULL, &syncUUIDs[i] ); + slap_sl_free( syncUUIDs[i].bv_val,op->o_tmpmemctx ); avl_insert( &si->si_presentlist, - (caddr_t) syncuuid_bv, - syncuuid_cmp, avl_dup_error ); + (caddr_t) syncuuid_bv, + syncuuid_cmp, avl_dup_error ); } - ber_memfree_x( syncUUIDs, op->o_tmpmemctx ); + slap_sl_free( syncUUIDs, op->o_tmpmemctx ); break; default: -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "do_syncrep2 : unknown syncinfo tag (%ld)\n", - (long) si_tag, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep2 : unknown syncinfo tag (%ld)\n", (long) si_tag, 0, 0 ); -#endif ldap_memfree( retoid ); ber_bvfree( retdata ); continue; @@ -691,8 +794,9 @@ do_syncrep2( &syncCookie.ctxcsn[0], &text ); } - if ( syncCookie.ctxcsn && syncCookie.ctxcsn[0].bv_val - && match < 0 ) { + if ( syncCookie.ctxcsn && !BER_BVISNULL( &syncCookie.ctxcsn[0] ) && + match < 0 ) + { syncrepl_updateCookie( si, op, psub, &syncCookie); } @@ -705,29 +809,20 @@ do_syncrep2( ldap_memfree( retoid ); ber_bvfree( retdata ); break; + } else { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR,"do_syncrep2 :" - " unknown intermediate " - "response\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep2 : " "unknown intermediate response (%d)\n", rc, 0, 0 ); -#endif ldap_memfree( retoid ); ber_bvfree( retdata ); break; } break; + default: -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, "do_syncrep2 : " - "unknown message\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep2 : " "unknown message\n", 0, 0, 0 ); -#endif break; } @@ -747,13 +842,8 @@ do_syncrep2( ldap_get_option( si->si_ld, LDAP_OPT_ERROR_NUMBER, &rc ); errstr = ldap_err2string( rc ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "do_syncrep2 : %s\n", errstr, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "do_syncrep2 : %s\n", errstr, 0, 0 ); -#endif } done: @@ -783,12 +873,10 @@ do_syncrepl( int first = 0; int dostop = 0; ber_socket_t s; + int i, defer = 1; + Backend *be; -#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; @@ -809,25 +897,16 @@ do_syncrepl( 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; + connection_fake_init( &conn, &op, ctx ); - /* set memory context */ - op.o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx ); - op.o_tmpmfuncs = &sl_mfuncs; + /* use global malloc for now */ + op.o_tmpmemctx = NULL; + op.o_tmpmfuncs = &ch_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_bd = be = si->si_be; op.o_sync_state.ctxcsn = NULL; op.o_sync_state.sid = -1; @@ -854,11 +933,10 @@ do_syncrepl( */ if ( rc == LDAP_SUCCESS ) { if ( first ) { - rc = connection_client_setup( s, (Listener *)&dummy_list, do_syncrepl, - arg ); + rc = connection_client_setup( s, do_syncrepl, arg ); } else { connection_client_enable( s ); - } + } } else if ( !first ) { dostop = 1; } @@ -874,6 +952,7 @@ do_syncrepl( * 4) for Persist and Success, reschedule to defer */ ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex ); + if ( ldap_pvt_runqueue_isrunning( &syncrepl_rq, rtask )) { ldap_pvt_runqueue_stoptask( &syncrepl_rq, rtask ); } @@ -882,17 +961,37 @@ do_syncrepl( connection_client_stop( s ); } - if ( rc && rc != LDAP_SERVER_DOWN ) { - ldap_pvt_runqueue_remove( &syncrepl_rq, rtask ); + if ( rc == LDAP_SUCCESS ) { + if ( si->si_type == LDAP_SYNC_REFRESH_ONLY ) { + defer = 0; + } + rtask->interval.tv_sec = si->si_interval; + ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, defer ); + if ( si->si_retrynum ) { + for ( i = 0; si->si_retrynum_init[i] != -2; i++ ) { + si->si_retrynum[i] = si->si_retrynum_init[i]; + } + si->si_retrynum[i] = -2; + } } else { - if ( rc == LDAP_SERVER_DOWN || - si->si_type == LDAP_SYNC_REFRESH_ONLY ) { - rc = 0; - } else { - rc = 1; + for ( i = 0; si->si_retrynum && si->si_retrynum[i] <= 0; i++ ) { + if ( si->si_retrynum[i] == -1 || si->si_retrynum[i] == -2 ) + break; + } + + if ( !si->si_retrynum || si->si_retrynum[i] == -2 ) { + ldap_pvt_runqueue_remove( &syncrepl_rq, rtask ); + LDAP_STAILQ_REMOVE( &be->be_syncinfo, si, syncinfo_s, si_next ); + syncinfo_free( si ); + } else if ( si->si_retrynum[i] >= -1 ) { + if ( si->si_retrynum[i] > 0 ) + si->si_retrynum[i]--; + rtask->interval.tv_sec = si->si_retryinterval[i]; + ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 0 ); + slap_wake_listener(); } - ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, rc ); } + ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex ); return NULL; @@ -924,13 +1023,8 @@ syncrepl_message_to_entry( *modlist = NULL; if ( ldap_msgtype( msg ) != LDAP_RES_SEARCH_ENTRY ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "Message type should be entry (%d)", ldap_msgtype( msg ), 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "Message type should be entry (%d)", ldap_msgtype( msg ), 0, 0 ); -#endif return -1; } @@ -939,24 +1033,20 @@ syncrepl_message_to_entry( rc = ldap_get_dn_ber( si->si_ld, msg, &ber, &bdn ); if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_message_to_entry : dn get failed (%d)", rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry : dn get failed (%d)", rc, 0, 0 ); -#endif return rc; } dnPrettyNormal( NULL, &bdn, &dn, &ndn, op->o_tmpmemctx ); ber_dupbv( &op->o_req_dn, &dn ); ber_dupbv( &op->o_req_ndn, &ndn ); - sl_free( ndn.bv_val, op->o_tmpmemctx ); - sl_free( dn.bv_val, op->o_tmpmemctx ); + slap_sl_free( ndn.bv_val, op->o_tmpmemctx ); + slap_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 ) { + if ( entry ) + *entry = NULL; return LDAP_SUCCESS; } @@ -971,7 +1061,7 @@ syncrepl_message_to_entry( while ( ber_remaining( ber ) ) { if ( (ber_scanf( ber, "{mW}", &tmp.sml_type, &tmp.sml_values ) == - LBER_ERROR ) || ( tmp.sml_type.bv_val == NULL )) + LBER_ERROR ) || BER_BVISNULL( &tmp.sml_type ) ) { break; } @@ -982,7 +1072,7 @@ syncrepl_message_to_entry( mod->sml_next = NULL; mod->sml_desc = NULL; mod->sml_type = tmp.sml_type; - mod->sml_bvalues = tmp.sml_bvalues; + mod->sml_values = tmp.sml_values; mod->sml_nvalues = NULL; *modtail = mod; @@ -990,107 +1080,122 @@ syncrepl_message_to_entry( } if ( *modlist == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_message_to_entry: no attributes\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: no attributes\n", - 0, 0, 0 ); -#endif + 0, 0, 0 ); + rc = -1; + goto done; } rc = slap_mods_check( *modlist, 1, &text, txtbuf, textlen, NULL ); if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_message_to_entry: mods check (%s)\n", text, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: mods check (%s)\n", - text, 0, 0 ); -#endif + text, 0, 0 ); goto done; } + + /* Strip out dynamically generated attrs */ + for ( modtail = modlist; *modtail ; ) { + mod = *modtail; + if ( mod->sml_desc->ad_type->sat_flags & SLAP_AT_DYNAMIC ) { + *modtail = mod->sml_next; + slap_mod_free( &mod->sml_mod, 0 ); + ch_free( mod ); + } else { + modtail = &mod->sml_next; + } + } + + /* Strip out attrs in exattrs list */ + for ( modtail = modlist; *modtail ; ) { + mod = *modtail; + if ( ldap_charray_inlist( si->si_exattrs, + mod->sml_desc->ad_type->sat_cname.bv_val )) { + *modtail = mod->sml_next; + slap_mod_free( &mod->sml_mod, 0 ); + ch_free( mod ); + } else { + modtail = &mod->sml_next; + } + } rc = slap_mods2entry( *modlist, &e, 1, 1, &text, txtbuf, textlen); if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_message_to_entry: mods2entry (%s)\n", text, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: mods2entry (%s)\n", - text, 0, 0 ); -#endif + text, 0, 0 ); } done: ber_free ( ber, 0 ); if ( rc != LDAP_SUCCESS ) { - entry_free( e ); - e = NULL; + if ( e ) { + entry_free( e ); + *entry = e = NULL; + } } return rc; } -static struct berval uuidbva[] = { - BER_BVNULL, - BER_BVNULL -}; - int syncrepl_entry( syncinfo_t* si, Operation *op, - Entry* e, + Entry* entry, Modifications* modlist, int syncstate, struct berval* syncUUID, - struct sync_cookie* syncCookie_req -) + struct sync_cookie* syncCookie_req ) { Backend *be = op->o_bd; slap_callback cb = { NULL }; struct berval *syncuuid_bv = NULL; - struct berval syncUUID_strrep = { 0, NULL }; + struct berval syncUUID_strrep = BER_BVNULL; + struct berval uuid_bv = BER_BVNULL; - SlapReply rs = {REP_RESULT}; + SlapReply rs_search = {REP_RESULT}; + SlapReply rs_delete = {REP_RESULT}; + SlapReply rs_add = {REP_RESULT}; + SlapReply rs_modify = {REP_RESULT}; Filter f = {0}; AttributeAssertion ava = {0}; int rc = LDAP_SUCCESS; int ret = LDAP_SUCCESS; const char *text; - struct berval pdn = { 0, NULL }; - struct berval org_req_dn = { 0, NULL }; - struct berval org_req_ndn = { 0, NULL }; - struct berval org_dn = { 0, NULL }; - struct berval org_ndn = { 0, NULL }; + struct berval pdn = BER_BVNULL; + struct berval org_req_dn = BER_BVNULL; + struct berval org_req_ndn = BER_BVNULL; + struct berval org_dn = BER_BVNULL; + struct berval org_ndn = BER_BVNULL; int org_managedsait; - if (( 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, syncuuid_cmp, avl_dup_error ); } if ( syncstate == LDAP_SYNC_PRESENT ) { - return e ? 1 : 0; + return 0; + } else if ( syncstate != LDAP_SYNC_DELETE ) { + if ( entry == NULL ) { + return 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 ); + (void)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 = STRLENOF( "entryUUID=" ) + syncUUID->bv_len; + op->ors_filterstr.bv_val = (char *) slap_sl_malloc( op->ors_filterstr.bv_len + 1, op->o_tmpmemctx ); - AC_MEMCPY( op->ors_filterstr.bv_val, "entryUUID=", sizeof("entryUUID=")-1 ); - AC_MEMCPY( &op->ors_filterstr.bv_val[sizeof("entryUUID=")-1], + AC_MEMCPY( op->ors_filterstr.bv_val, "entryUUID=", STRLENOF( "entryUUID=" ) ); + AC_MEMCPY( &op->ors_filterstr.bv_val[STRLENOF( "entryUUID=" )], syncUUID->bv_val, syncUUID->bv_len ); op->ors_filterstr.bv_val[op->ors_filterstr.bv_len] = '\0'; @@ -1101,25 +1206,32 @@ syncrepl_entry( op->o_req_dn = si->si_base; op->o_req_ndn = si->si_base; + op->o_time = slap_get_time(); + op->ors_tlimit = SLAP_NO_LIMIT; + op->ors_slimit = 1; + + op->ors_attrs = slap_anlist_no_attrs; + op->ors_attrsonly = 1; + /* set callback function */ op->o_callback = &cb; cb.sc_response = dn_callback; cb.sc_private = si; - si->si_syncUUID_ndn.bv_val = NULL; + BER_BVZERO( &si->si_syncUUID_ndn ); - if ( limits_check( op, &rs ) == 0 ) { - rc = be->be_search( op, &rs ); + if ( limits_check( op, &rs_search ) == 0 ) { + rc = be->be_search( op, &rs_search ); } - if ( op->ors_filterstr.bv_val ) { - sl_free( op->ors_filterstr.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &op->ors_filterstr ) ) { + slap_sl_free( op->ors_filterstr.bv_val, op->o_tmpmemctx ); } cb.sc_response = null_callback; cb.sc_private = si; - if ( rc == LDAP_SUCCESS && si->si_syncUUID_ndn.bv_val ) + if ( rs_search.sr_err == LDAP_SUCCESS && !BER_BVISNULL( &si->si_syncUUID_ndn ) ) { char *subseq_ptr; @@ -1128,7 +1240,7 @@ syncrepl_entry( } ber_dupbv( &op->o_sync_csn, syncCookie_req->ctxcsn ); - if ( op->o_sync_csn.bv_val ) { + if ( !BER_BVISNULL( &op->o_sync_csn ) ) { subseq_ptr = strstr( op->o_sync_csn.bv_val, "#0000" ); subseq_ptr += 4; *subseq_ptr = '1'; @@ -1137,7 +1249,7 @@ syncrepl_entry( 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 ); + rc = be->be_delete( op, &rs_delete ); org_req_dn = op->o_req_dn; org_req_ndn = op->o_req_ndn; @@ -1148,8 +1260,7 @@ syncrepl_entry( op->o_ndn = op->o_bd->be_rootndn; op->o_managedsait = 1; - while ( rs.sr_err == LDAP_SUCCESS && - op->o_delete_glue_parent ) { + while ( rs_delete.sr_err == LDAP_SUCCESS && op->o_delete_glue_parent ) { op->o_delete_glue_parent = 0; if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) { slap_callback cb = { NULL }; @@ -1158,7 +1269,7 @@ syncrepl_entry( op->o_req_dn = pdn; op->o_req_ndn = pdn; op->o_callback = &cb; - op->o_bd->be_delete( op, &rs ); + op->o_bd->be_delete( op, &rs_delete ); } else { break; } @@ -1177,87 +1288,76 @@ syncrepl_entry( switch ( syncstate ) { case LDAP_SYNC_ADD: case LDAP_SYNC_MODIFY: - if ( rc == LDAP_SUCCESS || - rc == LDAP_REFERRAL || - rc == LDAP_NO_SUCH_OBJECT || - rc == LDAP_NOT_ALLOWED_ON_NONLEAF ) + if ( rs_search.sr_err == LDAP_SUCCESS || + rs_search.sr_err == LDAP_REFERRAL || + rs_search.sr_err == LDAP_NO_SUCH_OBJECT || + rs_search.sr_err == LDAP_NOT_ALLOWED_ON_NONLEAF ) { - attr_delete( &e->e_attrs, slap_schema.si_ad_entryUUID ); - attr_merge_one( e, slap_schema.si_ad_entryUUID, - syncUUID, &ava.aa_value ); + attr_delete( &entry->e_attrs, slap_schema.si_ad_entryUUID ); + attr_merge_one( entry, slap_schema.si_ad_entryUUID, + &syncUUID_strrep, syncUUID ); op->o_tag = LDAP_REQ_ADD; - op->ora_e = e; - op->o_req_dn = e->e_name; - op->o_req_ndn = e->e_nname; - rc = be->be_add( op, &rs ); + op->ora_e = entry; + op->o_req_dn = entry->e_name; + op->o_req_ndn = entry->e_nname; - if ( rc != LDAP_SUCCESS ) { - if ( rc == LDAP_ALREADY_EXISTS ) { + rc = be->be_add( op, &rs_add ); + + if ( rs_add.sr_err != LDAP_SUCCESS ) { + if ( rs_add.sr_err == LDAP_ALREADY_EXISTS && + rs_search.sr_err != LDAP_NO_SUCH_OBJECT ) { Modifications *mod; - Modifications *modtail; + Modifications *modtail = modlist; + + assert( modlist ); for ( mod = modlist; mod != NULL; mod = mod->sml_next ) { modtail = mod; } mod = (Modifications *)ch_calloc(1, sizeof(Modifications)); - ber_dupbv( &uuidbva[0], syncUUID ); + ber_dupbv( &uuid_bv, syncUUID ); mod->sml_op = LDAP_MOD_REPLACE; mod->sml_desc = slap_schema.si_ad_entryUUID; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = uuidbva; + ber_bvarray_add( &mod->sml_values, &uuid_bv ); modtail->sml_next = mod; op->o_tag = LDAP_REQ_MODIFY; op->orm_modlist = modlist; - op->o_req_dn = e->e_name; - op->o_req_ndn = e->e_nname; + op->o_req_dn = entry->e_name; + op->o_req_ndn = entry->e_nname; - rc = be->be_modify( op, &rs ); - if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_entry : be_modify failed (%d)\n", - rc, 0, 0 ); -#else + rc = be->be_modify( op, &rs_modify ); + if ( rs_modify.sr_err != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, "syncrepl_entry : be_modify failed (%d)\n", - rc, 0, 0 ); -#endif + rs_modify.sr_err, 0, 0 ); } ret = 1; goto done; - } else if ( rc == LDAP_REFERRAL || rc == LDAP_NO_SUCH_OBJECT ) { - syncrepl_add_glue( op, e ); + } else if ( rs_modify.sr_err == LDAP_REFERRAL || + rs_modify.sr_err == LDAP_NO_SUCH_OBJECT ) { + syncrepl_add_glue( op, entry ); ret = 0; goto done; } else { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_entry : be_add failed (%d)\n", - rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_entry : be_add failed (%d)\n", - rc, 0, 0 ); -#endif + rs_add.sr_err, 0, 0 ); ret = 1; goto done; } } else { - be_entry_release_w( op, e ); + be_entry_release_w( op, entry ); ret = 0; goto done; } } else { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_entry : be_search failed (%d)\n", rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, - "syncrepl_entry : be_search failed (%d)\n", rc, 0, 0 ); -#endif + "syncrepl_entry : be_search failed (%d)\n", + rs_search.sr_err, 0, 0 ); ret = 1; goto done; } @@ -1268,24 +1368,21 @@ syncrepl_entry( goto done; default : -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_entry : unknown syncstate\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_entry : unknown syncstate\n", 0, 0, 0 ); -#endif ret = 1; goto done; } done : - if ( syncUUID_strrep.bv_val ) { - ber_memfree_x( syncUUID_strrep.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &syncUUID_strrep ) ) { + slap_sl_free( syncUUID_strrep.bv_val, op->o_tmpmemctx ); + BER_BVZERO( &syncUUID_strrep ); } - if ( si->si_syncUUID_ndn.bv_val ) { - ber_memfree_x( si->si_syncUUID_ndn.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &si->si_syncUUID_ndn ) ) { + ch_free( si->si_syncUUID_ndn.bv_val ); + BER_BVZERO( &si->si_syncUUID_ndn ); } return ret; } @@ -1299,12 +1396,13 @@ static struct berval gcbva[] = { static void syncrepl_del_nonpresent( Operation *op, - syncinfo_t *si -) + syncinfo_t *si ) { Backend* be = op->o_bd; slap_callback cb = { NULL }; - SlapReply rs = {REP_RESULT}; + SlapReply rs_search = {REP_RESULT}; + SlapReply rs_delete = {REP_RESULT}; + SlapReply rs_modify = {REP_RESULT}; struct nonpresent_entry *np_list, *np_prev; int rc; Modifications *ml; @@ -1313,12 +1411,13 @@ syncrepl_del_nonpresent( Modifications *modlist = NULL; Modifications **modtail = &modlist; Attribute *attr; + AttributeName an[2]; - struct berval pdn = { 0, NULL }; - struct berval org_req_dn = { 0, NULL }; - struct berval org_req_ndn = { 0, NULL }; - struct berval org_dn = { 0, NULL }; - struct berval org_ndn = { 0, NULL }; + struct berval pdn = BER_BVNULL; + struct berval org_req_dn = BER_BVNULL; + struct berval org_req_ndn = BER_BVNULL; + struct berval org_dn = BER_BVNULL; + struct berval org_ndn = BER_BVNULL; int org_managedsait; op->o_req_dn = si->si_base; @@ -1331,18 +1430,24 @@ syncrepl_del_nonpresent( op->o_tag = LDAP_REQ_SEARCH; op->ors_scope = si->si_scope; op->ors_deref = LDAP_DEREF_NEVER; - op->ors_slimit = 0; - op->ors_tlimit = 0; + op->o_time = slap_get_time(); + op->ors_tlimit = SLAP_NO_LIMIT; + op->ors_slimit = SLAP_NO_LIMIT; + + memset( &an[0], 0, 2 * sizeof( AttributeName ) ); + an[0].an_name = slap_schema.si_ad_entryUUID->ad_cname; + an[0].an_desc = slap_schema.si_ad_entryUUID; + op->ors_attrs = an; + op->ors_attrsonly = 0; - op->ors_attrs = NULL; op->ors_filter = str2filter_x( op, si->si_filterstr.bv_val ); op->ors_filterstr = si->si_filterstr; op->o_nocaching = 1; op->o_managedsait = 0; - if ( limits_check( op, &rs ) == 0 ) { - be->be_search( op, &rs ); + if ( limits_check( op, &rs_search ) == 0 ) { + rc = be->be_search( op, &rs_search ); } op->o_managedsait = 1; @@ -1362,14 +1467,14 @@ syncrepl_del_nonpresent( cb.sc_private = si; op->o_req_dn = *np_prev->npe_name; op->o_req_ndn = *np_prev->npe_nname; - rc = op->o_bd->be_delete( op, &rs ); + rc = op->o_bd->be_delete( op, &rs_delete ); - if ( rc == LDAP_NOT_ALLOWED_ON_NONLEAF ) { + if ( rs_delete.sr_err == LDAP_NOT_ALLOWED_ON_NONLEAF ) { mod = (Modifications *) ch_calloc( 1, sizeof( Modifications )); mod->sml_op = LDAP_MOD_REPLACE; mod->sml_desc = slap_schema.si_ad_objectClass; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = &gcbva[0]; + mod->sml_values = &gcbva[0]; *modtail = mod; modtail = &mod->sml_next; @@ -1377,14 +1482,14 @@ syncrepl_del_nonpresent( mod->sml_op = LDAP_MOD_REPLACE; mod->sml_desc = slap_schema.si_ad_structuralObjectClass; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = &gcbva[1]; + mod->sml_values = &gcbva[1]; *modtail = mod; modtail = &mod->sml_next; op->o_tag = LDAP_REQ_MODIFY; op->orm_modlist = modlist; - rc = be->be_modify( op, &rs ); + rc = be->be_modify( op, &rs_modify ); for ( ml = modlist; ml != NULL; ml = mlnext ) { mlnext = ml->sml_next; @@ -1401,7 +1506,7 @@ syncrepl_del_nonpresent( op->o_ndn = op->o_bd->be_rootndn; op->o_managedsait = 1; - while ( rs.sr_err == LDAP_SUCCESS && + while ( rs_delete.sr_err == LDAP_SUCCESS && op->o_delete_glue_parent ) { op->o_delete_glue_parent = 0; if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) { @@ -1412,7 +1517,7 @@ syncrepl_del_nonpresent( op->o_req_ndn = pdn; op->o_callback = &cb; /* give it a root privil ? */ - op->o_bd->be_delete( op, &rs ); + op->o_bd->be_delete( op, &rs_delete ); } else { break; } @@ -1427,8 +1532,8 @@ syncrepl_del_nonpresent( ber_bvfree( np_prev->npe_name ); ber_bvfree( np_prev->npe_nname ); - op->o_req_dn.bv_val = NULL; - op->o_req_ndn.bv_val = NULL; + BER_BVZERO( &op->o_req_dn ); + BER_BVZERO( &op->o_req_ndn ); ch_free( np_prev ); } } @@ -1436,12 +1541,10 @@ syncrepl_del_nonpresent( return; } - void syncrepl_add_glue( Operation* op, - Entry *e -) + Entry *e ) { Backend *be = op->o_bd; slap_callback cb = { NULL }; @@ -1452,7 +1555,7 @@ syncrepl_add_glue( struct berval dn = {0, NULL}; struct berval ndn = {0, NULL}; Entry *glue; - SlapReply rs = {REP_RESULT}; + SlapReply rs_add = {REP_RESULT}; char *ptr, *comma; op->o_tag = LDAP_REQ_ADD; @@ -1464,8 +1567,8 @@ syncrepl_add_glue( ndn = e->e_nname; /* count RDNs in suffix */ - if ( be->be_nsuffix[0].bv_len ) { - for (i=0, ptr=be->be_nsuffix[0].bv_val; ptr; ptr=strchr( ptr, ',' )) { + if ( !BER_BVISEMPTY( &be->be_nsuffix[0] ) ) { + for ( i = 0, ptr = be->be_nsuffix[0].bv_val; ptr; ptr = strchr( ptr, ',' ) ) { ptr++; i++; } @@ -1477,7 +1580,7 @@ syncrepl_add_glue( /* Start with BE suffix */ for ( i = 0, ptr = NULL; i < suffrdns; i++ ) { - comma = strrchr(dn.bv_val, ','); + comma = strrchr( dn.bv_val, ',' ); if ( ptr ) *ptr = ','; if ( comma ) *comma = '\0'; ptr = comma; @@ -1528,8 +1631,8 @@ syncrepl_add_glue( op->o_req_dn = glue->e_name; op->o_req_ndn = glue->e_nname; op->ora_e = glue; - rc = be->be_add ( op, &rs ); - if ( rc == LDAP_SUCCESS ) { + rc = be->be_add ( op, &rs_add ); + if ( rs_add.sr_err == LDAP_SUCCESS ) { be_entry_release_w( op, glue ); } else { /* incl. ALREADY EXIST */ @@ -1556,8 +1659,8 @@ syncrepl_add_glue( op->o_req_dn = e->e_name; op->o_req_ndn = e->e_nname; op->ora_e = e; - rc = be->be_add ( op, &rs ); - if ( rc == LDAP_SUCCESS ) { + rc = be->be_add ( op, &rs_add ); + if ( rs_add.sr_err == LDAP_SUCCESS ) { be_entry_release_w( op, e ); } else { entry_free( e ); @@ -1593,8 +1696,7 @@ syncrepl_updateCookie( syncinfo_t *si, Operation *op, struct berval *pdn, - struct sync_cookie *syncCookie -) + struct sync_cookie *syncCookie ) { Backend *be = op->o_bd; Modifications *ml; @@ -1615,7 +1717,8 @@ syncrepl_updateCookie( struct berval slap_syncrepl_cn_bv = BER_BVNULL; slap_callback cb = { NULL }; - SlapReply rs = {REP_RESULT}; + SlapReply rs_add = {REP_RESULT}; + SlapReply rs_modify = {REP_RESULT}; slap_sync_cookie_free( &si->si_syncCookie, 0 ); slap_dup_sync_cookie( &si->si_syncCookie, syncCookie ); @@ -1624,38 +1727,41 @@ syncrepl_updateCookie( mod->sml_op = LDAP_MOD_REPLACE; mod->sml_desc = slap_schema.si_ad_objectClass; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = ocbva; + mod->sml_values = ocbva; *modtail = mod; modtail = &mod->sml_next; ber_dupbv( &cnbva[0], (struct berval *) &slap_syncrepl_bvc ); assert( si->si_rid < 1000 ); cnbva[0].bv_len = snprintf( cnbva[0].bv_val, - slap_syncrepl_bvc.bv_len, + slap_syncrepl_bvc.bv_len + 1, "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; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = cnbva; + mod->sml_values = cnbva; *modtail = mod; modtail = &mod->sml_next; - if ( scbva[0].bv_val ) ch_free( scbva[0].bv_val ); - 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; + mod->sml_desc = slap_schema.si_ad_subtreeSpecification; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = scbva; + mod->sml_values = ssbva; *modtail = mod; modtail = &mod->sml_next; + /* Keep this last, so we can avoid touching the previous + * attributes unnecessarily. + */ + if ( scbva[0].bv_val ) ch_free( scbva[0].bv_val ); + 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_subtreeSpecification; + mod->sml_desc = slap_schema.si_ad_syncreplCookie; mod->sml_type = mod->sml_desc->ad_cname; - mod->sml_bvalues = ssbva; + mod->sml_values = scbva; *modtail = mod; modtail = &mod->sml_next; @@ -1663,20 +1769,15 @@ syncrepl_updateCookie( op->o_tag = LDAP_REQ_ADD; rc = slap_mods_opattrs( op, modlist, modtail, - &text,txtbuf, textlen ); + &text, txtbuf, textlen, 0 ); for ( ml = modlist; ml != NULL; ml = ml->sml_next ) { ml->sml_op = LDAP_MOD_REPLACE; } if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_updateCookie: mods opattrs (%s)\n", text, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_updateCookie: mods opattrs (%s)\n", text, 0, 0 ); -#endif } e = ( Entry * ) ch_calloc( 1, sizeof( Entry )); @@ -1684,7 +1785,7 @@ syncrepl_updateCookie( slap_syncrepl_cn_bv.bv_val = syncrepl_cbuf; assert( si->si_rid < 1000 ); slap_syncrepl_cn_bv.bv_len = snprintf( slap_syncrepl_cn_bv.bv_val, - slap_syncrepl_cn_bvc.bv_len, + slap_syncrepl_cn_bvc.bv_len + 1, "cn=syncrepl%ld", si->si_rid ); build_new_dn( &slap_syncrepl_dn_bv, pdn, &slap_syncrepl_cn_bv, @@ -1692,8 +1793,8 @@ syncrepl_updateCookie( ber_dupbv( &e->e_name, &slap_syncrepl_dn_bv ); ber_dupbv( &e->e_nname, &slap_syncrepl_dn_bv ); - if ( slap_syncrepl_dn_bv.bv_val ) { - sl_free( slap_syncrepl_dn_bv.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &slap_syncrepl_dn_bv ) ) { + slap_sl_free( slap_syncrepl_dn_bv.bv_val, op->o_tmpmemctx ); } e->e_attrs = NULL; @@ -1701,13 +1802,8 @@ syncrepl_updateCookie( rc = slap_mods2entry( modlist, &e, 1, 1, &text, txtbuf, textlen ); if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syncrepl_updateCookie: mods2entry (%s)\n", text, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "syncrepl_updateCookie: mods2entry (%s)\n", text, 0, 0 ); -#endif } cb.sc_response = null_callback; @@ -1720,52 +1816,35 @@ syncrepl_updateCookie( /* update persistent cookie */ update_cookie_retry: op->o_tag = LDAP_REQ_MODIFY; - op->orm_modlist = modlist; - rc = be->be_modify( op, &rs ); + /* Just modify the cookie value, not the entire entry */ + op->orm_modlist = mod; + rc = be->be_modify( op, &rs_modify ); - if ( rc != LDAP_SUCCESS ) { - if ( rc == LDAP_REFERRAL || - rc == LDAP_NO_SUCH_OBJECT ) { + if ( rs_modify.sr_err != LDAP_SUCCESS ) { + if ( rs_modify.sr_err == LDAP_REFERRAL || + rs_modify.sr_err == LDAP_NO_SUCH_OBJECT ) { op->o_tag = LDAP_REQ_ADD; op->ora_e = e; - rc = be->be_add( op, &rs ); - if ( rc != LDAP_SUCCESS ) { - if ( rc == LDAP_ALREADY_EXISTS ) { + rc = be->be_add( op, &rs_add ); + if ( rs_add.sr_err != LDAP_SUCCESS ) { + if ( rs_add.sr_err == LDAP_ALREADY_EXISTS ) { goto update_cookie_retry; - } else if ( rc == LDAP_REFERRAL || - rc == LDAP_NO_SUCH_OBJECT ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "cookie will be non-persistent\n", - 0, 0, 0 ); -#else + } else if ( rs_add.sr_err == LDAP_REFERRAL || + rs_add.sr_err == LDAP_NO_SUCH_OBJECT ) { Debug( LDAP_DEBUG_ANY, "cookie will be non-persistent\n", 0, 0, 0 ); -#endif } else { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "be_add failed (%d)\n", - rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, - "be_add failed (%d)\n", - rc, 0, 0 ); -#endif + "be_add failed (%d)\n", rs_add.sr_err, 0, 0 ); } } else { be_entry_release_w( op, e ); goto done; } } else { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "be_modify failed (%d)\n", rc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, - "be_modify failed (%d)\n", rc, 0, 0 ); -#endif + "be_modify failed (%d)\n", rs_modify.sr_err, 0, 0 ); } } @@ -1775,13 +1854,13 @@ update_cookie_retry: done : - if ( cnbva[0].bv_val ) { + if ( !BER_BVISNULL( &cnbva[0] ) ) { ch_free( cnbva[0].bv_val ); - cnbva[0].bv_val = NULL; + BER_BVZERO( &cnbva[0] ); } - if ( scbva[0].bv_val ) { + if ( !BER_BVISNULL( &scbva[0] ) ) { ch_free( scbva[0].bv_val ); - scbva[0].bv_val = NULL; + BER_BVZERO( &scbva[0] ); } if ( mlnext->sml_next ) { @@ -1797,25 +1876,50 @@ done : return; } +int +syncrepl_isupdate( Operation *op ) +{ + return ( syncrepl_isupdate_dn( op->o_bd, &op->o_ndn )); +} + +int +syncrepl_isupdate_dn( + Backend* be, + struct berval* ndn ) +{ + syncinfo_t* si; + int ret = 0; + + if ( !LDAP_STAILQ_EMPTY( &be->be_syncinfo )) { + LDAP_STAILQ_FOREACH( si, &be->be_syncinfo, si_next ) { + if ( ( ret = dn_match( &si->si_updatedn, ndn ) ) ) { + return ret; + } + } + } + return 0; +} + static int dn_callback( Operation* op, - SlapReply* rs -) + SlapReply* rs ) { syncinfo_t *si = op->o_callback->sc_private; if ( rs->sr_type == REP_SEARCH ) { - 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 ); -#else + if ( !BER_BVISNULL( &si->si_syncUUID_ndn ) ) { Debug( LDAP_DEBUG_ANY, - "dn_callback : multiple entries match dn\n", 0, 0, 0 ); -#endif + "dn_callback : consistency error - " + "entryUUID is not unique\n", 0, 0, 0 ); } else { - ber_dupbv_x( &si->si_syncUUID_ndn, &rs->sr_entry->e_nname, op->o_tmpmemctx ); + ber_dupbv_x( &si->si_syncUUID_ndn, &rs->sr_entry->e_nname, NULL ); + } + } else if ( rs->sr_type == REP_RESULT ) { + if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) { + Debug( LDAP_DEBUG_ANY, + "dn_callback : consistency error - " + "entryUUID is not unique\n", 0, 0, 0 ); } } @@ -1825,8 +1929,7 @@ dn_callback( static int nonpresent_callback( Operation* op, - SlapReply* rs -) + SlapReply* rs ) { syncinfo_t *si = op->o_callback->sc_private; Attribute *a; @@ -1843,7 +1946,7 @@ nonpresent_callback( if ( a == NULL ) return 0; - present_uuid = avl_find( si->si_presentlist, &a->a_vals[0], + present_uuid = avl_find( si->si_presentlist, &a->a_nvals[0], syncuuid_cmp ); if ( present_uuid == NULL ) { @@ -1855,7 +1958,7 @@ nonpresent_callback( } else { avl_delete( &si->si_presentlist, - &a->a_vals[0], syncuuid_cmp ); + &a->a_nvals[0], syncuuid_cmp ); ch_free( present_uuid->bv_val ); ch_free( present_uuid ); } @@ -1874,15 +1977,9 @@ null_callback( rs->sr_err != LDAP_NO_SUCH_OBJECT && rs->sr_err != LDAP_NOT_ALLOWED_ON_NONLEAF ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "null_callback : error code 0x%x\n", - rs->sr_err, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "null_callback : error code 0x%x\n", rs->sr_err, 0, 0 ); -#endif } return LDAP_SUCCESS; } @@ -1912,8 +2009,7 @@ slap_create_syncrepl_entry( context_csn, NULL ); } - bv.bv_val = "{}"; - bv.bv_len = sizeof("{}")-1; + BER_BVSTR( &bv, "{}" ); attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL ); build_new_dn( &e->e_name, &be->be_nsuffix[0], rdn, NULL ); @@ -1932,24 +2028,24 @@ slap_uuidstr_from_normalized( unsigned char nibble; int i, d = 0; - if ( normalized == NULL ) - return NULL; - - if ( normalized->bv_len != 16 ) { - return NULL; - } + 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 = (struct berval *)slap_sl_malloc( sizeof(struct berval), ctx ); + if ( new == NULL ) { + return NULL; + } } new->bv_len = 36; - if (( new->bv_val = sl_malloc( new->bv_len + 1, ctx )) == NULL) { - if ( !uuidstr ) - sl_free( new, ctx ); + if ( ( new->bv_val = slap_sl_malloc( new->bv_len + 1, ctx ) ) == NULL ) { + if ( new != uuidstr ) { + slap_sl_free( new, ctx ); + } return NULL; } @@ -1975,7 +2071,6 @@ slap_uuidstr_from_normalized( } new->bv_val[new->bv_len] = '\0'; - return new; } @@ -1986,18 +2081,128 @@ syncuuid_cmp( const void* v_uuid1, const void* v_uuid2 ) 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 ) ); + return ( memcmp( uuid1->bv_val, uuid2->bv_val, uuid1->bv_len ) ); } static void -avl_ber_bvfree( void *bv ) +avl_ber_bvfree( void *v_bv ) { - if( bv == NULL ) { - return; - } - if ( ((struct berval *)bv)->bv_val != NULL ) { - ch_free ( ((struct berval *)bv)->bv_val ); + struct berval *bv = (struct berval *)v_bv; + + if( v_bv == NULL ) return; + if ( !BER_BVISNULL( bv ) ) { + ch_free( bv->bv_val ); } - ch_free ( (char *) bv ); + ch_free( (char *) bv ); } +void +syncinfo_free( syncinfo_t *sie ) +{ + if ( sie->si_provideruri ) { + ch_free( sie->si_provideruri ); + } + if ( sie->si_provideruri_bv ) { + ber_bvarray_free( sie->si_provideruri_bv ); + } + if ( sie->si_updatedn.bv_val ) { + ch_free( sie->si_updatedn.bv_val ); + } + if ( sie->si_binddn ) { + ch_free( sie->si_binddn ); + } + if ( sie->si_passwd ) { + ch_free( sie->si_passwd ); + } + if ( sie->si_saslmech ) { + ch_free( sie->si_saslmech ); + } + if ( sie->si_secprops ) { + ch_free( sie->si_secprops ); + } + if ( sie->si_realm ) { + ch_free( sie->si_realm ); + } + if ( sie->si_authcId ) { + ch_free( sie->si_authcId ); + } + if ( sie->si_authzId ) { + ch_free( sie->si_authzId ); + } + if ( sie->si_filterstr.bv_val ) { + ch_free( sie->si_filterstr.bv_val ); + } + if ( sie->si_base.bv_val ) { + ch_free( sie->si_base.bv_val ); + } + if ( sie->si_attrs ) { + int i = 0; + while ( sie->si_attrs[i] != NULL ) { + ch_free( sie->si_attrs[i] ); + i++; + } + ch_free( sie->si_attrs ); + } + if ( sie->si_exattrs ) { + int i = 0; + while ( sie->si_exattrs[i] != NULL ) { + ch_free( sie->si_exattrs[i] ); + i++; + } + ch_free( sie->si_exattrs ); + } + if ( sie->si_anlist ) { + int i = 0; + while ( sie->si_anlist[i].an_name.bv_val != NULL ) { + ch_free( sie->si_anlist[i].an_name.bv_val ); + i++; + } + ch_free( sie->si_anlist ); + } + if ( sie->si_exanlist ) { + int i = 0; + while ( sie->si_exanlist[i].an_name.bv_val != NULL ) { + ch_free( sie->si_exanlist[i].an_name.bv_val ); + i++; + } + ch_free( sie->si_exanlist ); + } + if ( sie->si_retryinterval ) { + ch_free( sie->si_retryinterval ); + } + if ( sie->si_retrynum ) { + ch_free( sie->si_retrynum ); + } + if ( sie->si_retrynum_init ) { + ch_free( sie->si_retrynum_init ); + } + slap_sync_cookie_free( &sie->si_syncCookie, 0 ); + if ( sie->si_syncUUID_ndn.bv_val ) { + ch_free( sie->si_syncUUID_ndn.bv_val ); + } + if ( sie->si_presentlist ) { + avl_free( sie->si_presentlist, avl_ber_bvfree ); + } + if ( sie->si_ld ) { + ldap_ld_free( sie->si_ld, 1, NULL, NULL ); + } + while ( !LDAP_LIST_EMPTY( &sie->si_nonpresentlist )) { + struct nonpresent_entry* npe; + npe = LDAP_LIST_FIRST( &sie->si_nonpresentlist ); + LDAP_LIST_REMOVE( npe, npe_link ); + if ( npe->npe_name ) { + if ( npe->npe_name->bv_val ) { + ch_free( npe->npe_name->bv_val ); + } + ch_free( npe->npe_name ); + } + if ( npe->npe_nname ) { + if ( npe->npe_nname->bv_val ) { + ch_free( npe->npe_nname->bv_val ); + } + ch_free( npe->npe_nname ); + } + ch_free( npe ); + } + ch_free( sie ); +}