--- servers/slapd/overlays/syncprov.c 2005/10/02 08:48:28 1.109 +++ servers/slapd/overlays/syncprov.c 2005/12/07 11:09:00 1.135 @@ -1,4 +1,4 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.108 2005/10/02 03:01:45 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.134 2005/12/07 08:51:12 ando Exp $ */ /* syncprov.c - syncrepl provider */ /* This work is part of OpenLDAP Software . * @@ -69,7 +69,8 @@ typedef struct syncops { int s_inuse; /* reference count */ struct syncres *s_res; struct syncres *s_restail; - void *s_qtask; /* task for playing psearch responses */ + struct re_s *s_qtask; /* task for playing psearch responses */ +#define RUNQ_INTERVAL 36000 /* a long time */ ldap_pvt_thread_mutex_t s_mutex; } syncops; @@ -121,6 +122,7 @@ typedef struct syncprov_info_t { int si_chktime; int si_numops; /* number of ops since last checkpoint */ int si_nopres; /* Skip present phase */ + int si_usehint; /* use reload hint */ time_t si_chklast; /* time of last checkpoint */ Avlnode *si_mods; /* entries being modified */ sessionlog *si_logs; @@ -381,6 +383,9 @@ findbase_cb( Operation *op, SlapReply *r return LDAP_SUCCESS; } +static Filter generic_filter = { LDAP_FILTER_PRESENT, { 0 }, NULL }; +static struct berval generic_filterstr = BER_BVC("(objectclass=*)"); + static int syncprov_findbase( Operation *op, fbase_cookie *fc ) { @@ -420,6 +425,8 @@ syncprov_findbase( Operation *op, fbase_ fop.ors_tlimit = SLAP_NO_LIMIT; fop.ors_attrs = slap_anlist_no_attrs; fop.ors_attrsonly = 1; + fop.ors_filter = &generic_filter; + fop.ors_filterstr = generic_filterstr; fop.o_bd->bd_info = on->on_info->oi_orig; rc = fop.o_bd->be_search( &fop, &frs ); @@ -443,12 +450,10 @@ syncprov_findbase( Operation *op, fbase_ case LDAP_SCOPE_SUBTREE: fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ); break; -#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ) && !dn_match( fc->fdn, &fc->fss->s_base ); break; -#endif } } @@ -476,9 +481,11 @@ syncprov_findbase( Operation *op, fbase_ * CSN, and generate Present records for them. We always collect this result * in SyncID sets, even if there's only one match. */ -#define FIND_MAXCSN 1 -#define FIND_CSN 2 -#define FIND_PRESENT 3 +typedef enum find_csn_t { + FIND_MAXCSN = 1, + FIND_CSN = 2, + FIND_PRESENT = 3 +} find_csn_t; static int findmax_cb( Operation *op, SlapReply *rs ) @@ -501,7 +508,11 @@ findcsn_cb( Operation *op, SlapReply *rs { slap_callback *sc = op->o_callback; - if ( rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS ) { + /* We just want to know that at least one exists, so it's OK if + * we exceed the unchecked limit. + */ + if ( rs->sr_err == LDAP_ADMINLIMIT_EXCEEDED || + (rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS )) { sc->sc_private = (void *)1; } return LDAP_SUCCESS; @@ -557,7 +568,7 @@ findpres_cb( Operation *op, SlapReply *r } static int -syncprov_findcsn( Operation *op, int mode ) +syncprov_findcsn( Operation *op, find_csn_t mode ) { slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; syncprov_info_t *si = on->on_bi.bi_private; @@ -574,10 +585,10 @@ syncprov_findcsn( Operation *op, int mod #else AttributeAssertion eq = { NULL, BER_BVNULL }; #endif - int i, rc = LDAP_SUCCESS; fpres_cookie pcookie; sync_control *srs = NULL; - int findcsn_retry = 1; + struct slap_limits_set fc_limits; + int i, rc = LDAP_SUCCESS, findcsn_retry = 1; if ( mode != FIND_MAXCSN ) { srs = op->o_controls[slap_cids.sc_LDAPsync]; @@ -628,6 +639,8 @@ again: /* On retry, look for <= */ } else { cf.f_choice = LDAP_FILTER_LE; + fop.ors_limit = &fc_limits; + fc_limits.lms_s_unchecked = 1; fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)", cf.f_av_value.bv_val ); } @@ -696,9 +709,39 @@ again: return rc; } +static void +syncprov_free_syncop( syncops *so ) +{ + syncres *sr, *srnext; + GroupAssertion *ga, *gnext; + + ldap_pvt_thread_mutex_lock( &so->s_mutex ); + if ( --so->s_inuse > 0 ) { + ldap_pvt_thread_mutex_unlock( &so->s_mutex ); + return; + } + ldap_pvt_thread_mutex_unlock( &so->s_mutex ); + if ( so->s_flags & PS_IS_DETACHED ) { + filter_free( so->s_op->ors_filter ); + for ( ga = so->s_op->o_groups; ga; ga=gnext ) { + gnext = ga->ga_next; + ch_free( ga ); + } + ch_free( so->s_op ); + } + ch_free( so->s_base.bv_val ); + for ( sr=so->s_res; sr; sr=srnext ) { + srnext = sr->s_next; + ch_free( sr ); + } + ldap_pvt_thread_mutex_destroy( &so->s_mutex ); + ch_free( so ); +} + /* Send a persistent search response */ static int -syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, Entry **e, int mode) +syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, + Entry **e, int mode ) { slap_overinst *on = opc->son; @@ -719,6 +762,7 @@ syncprov_sendresp( Operation *op, opcook a_uuid.a_nvals = &opc->suuid; rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid, mode, ctrls, 0, 1, &cookie ); + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); rs.sr_ctrls = ctrls; op->o_bd->bd_info = (BackendInfo *)on->on_info; @@ -761,8 +805,11 @@ syncprov_sendresp( Operation *op, opcook default: assert(0); } - op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx ); - rs.sr_ctrls = NULL; + /* In case someone else freed it already? */ + if ( rs.sr_ctrls ) { + op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx ); + rs.sr_ctrls = NULL; + } return rs.sr_err; } @@ -788,34 +835,33 @@ syncprov_qplay( Operation *op, slap_over so->s_restail = NULL; ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - if ( !sr ) + if ( !sr || so->s_op->o_abandon ) break; - if ( !so->s_op->o_abandon ) { - opc.sdn = sr->s_dn; - opc.sndn = sr->s_ndn; - opc.suuid = sr->s_uuid; - opc.sctxcsn = sr->s_csn; - opc.sreference = sr->s_isreference; - e = NULL; - - if ( sr->s_mode != LDAP_SYNC_DELETE ) { - rc = be_entry_get_rw( op, &opc.sndn, NULL, NULL, 0, &e ); - if ( rc ) { - ch_free( sr ); - continue; - } + opc.sdn = sr->s_dn; + opc.sndn = sr->s_ndn; + opc.suuid = sr->s_uuid; + opc.sctxcsn = sr->s_csn; + opc.sreference = sr->s_isreference; + e = NULL; + + if ( sr->s_mode != LDAP_SYNC_DELETE ) { + rc = be_entry_get_rw( op, &opc.sndn, NULL, NULL, 0, &e ); + if ( rc ) { + ch_free( sr ); + continue; } - rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode ); + } + rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode ); - if ( e ) { - be_entry_release_rw( op, e, 0 ); - } - if ( rc ) - break; + if ( e ) { + be_entry_release_rw( op, e, 0 ); } ch_free( sr ); + + if ( rc ) + break; } op->o_bd->bd_info = (BackendInfo *)on; return rc; @@ -828,14 +874,15 @@ syncprov_qtask( void *ctx, void *arg ) struct re_s *rtask = arg; syncops *so = rtask->arg; slap_overinst *on = so->s_op->o_private; - char opbuf[OPERATION_BUFFER_SIZE]; + OperationBuffer opbuf; Operation *op; BackendDB be; - op = (Operation *)opbuf; - memset( op, 0, sizeof(opbuf)); + op = (Operation *) &opbuf; + *op = *so->s_op; op->o_hdr = (Opheader *)(op+1); op->o_controls = (void **)(op->o_hdr+1); + memset( op->o_controls, 0, SLAP_MAX_CIDS * sizeof(void *)); *op->o_hdr = *so->s_op->o_hdr; @@ -852,6 +899,9 @@ syncprov_qtask( void *ctx, void *arg ) syncprov_qplay( op, on, so ); + /* decrement use count... */ + syncprov_free_syncop( so ); + /* wait until we get explicitly scheduled again */ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_runqueue_stoptask( &slapd_rq, so->s_qtask ); @@ -874,13 +924,14 @@ syncprov_qresp( opcookie *opc, syncops * sr->s_dn.bv_len = opc->sdn.bv_len; sr->s_mode = mode; sr->s_isreference = opc->sreference; - sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val, opc->sdn.bv_val ); + sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val, + opc->sdn.bv_val ) + 1; sr->s_ndn.bv_len = opc->sndn.bv_len; - *(sr->s_ndn.bv_val++) = '\0'; - sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val, opc->sndn.bv_val ); + sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val, + opc->sndn.bv_val ) + 1; sr->s_uuid.bv_len = opc->suuid.bv_len; - *(sr->s_uuid.bv_val++) = '\0'; - sr->s_csn.bv_val = lutil_strcopy( sr->s_uuid.bv_val, opc->suuid.bv_val ); + AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len ); + sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1; sr->s_csn.bv_len = opc->sctxcsn.bv_len; strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val ); @@ -900,12 +951,17 @@ syncprov_qresp( opcookie *opc, syncops * if ( so->s_flags & PS_IS_DETACHED ) { ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); if ( !so->s_qtask ) { - so->s_qtask = ldap_pvt_runqueue_insert( &slapd_rq, 0, + so->s_qtask = ldap_pvt_runqueue_insert( &slapd_rq, RUNQ_INTERVAL, syncprov_qtask, so, "syncprov_qtask", so->s_op->o_conn->c_peer_name.bv_val ); + ++so->s_inuse; } else { - if (!ldap_pvt_runqueue_isrunning( &slapd_rq, so->s_qtask )) { + if (!ldap_pvt_runqueue_isrunning( &slapd_rq, so->s_qtask ) && + !so->s_qtask->next_sched.tv_sec ) { + so->s_qtask->interval.tv_sec = 0; ldap_pvt_runqueue_resched( &slapd_rq, so->s_qtask, 0 ); + so->s_qtask->interval.tv_sec = RUNQ_INTERVAL; + ++so->s_inuse; } } ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); @@ -914,36 +970,6 @@ syncprov_qresp( opcookie *opc, syncops * return LDAP_SUCCESS; } -static void -syncprov_free_syncop( syncops *so ) -{ - syncres *sr, *srnext; - GroupAssertion *ga, *gnext; - - ldap_pvt_thread_mutex_lock( &so->s_mutex ); - so->s_inuse--; - if ( so->s_inuse > 0 ) { - ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - return; - } - ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - if ( so->s_flags & PS_IS_DETACHED ) { - filter_free( so->s_op->ors_filter ); - for ( ga = so->s_op->o_groups; ga; ga=gnext ) { - gnext = ga->ga_next; - ch_free( ga ); - } - ch_free( so->s_op ); - } - ch_free( so->s_base.bv_val ); - for ( sr=so->s_res; sr; sr=srnext ) { - srnext = sr->s_next; - ch_free( sr ); - } - ldap_pvt_thread_mutex_destroy( &so->s_mutex ); - ch_free( so ); -} - static int syncprov_drop_psearch( syncops *so, int lock ) { @@ -1119,14 +1145,14 @@ syncprov_matchops( Operation *op, opcook sm = op->o_tmpalloc( sizeof(syncmatches), op->o_tmpmemctx ); sm->sm_next = opc->smatches; sm->sm_op = ss; - ss->s_inuse++; + ldap_pvt_thread_mutex_lock( &ss->s_mutex ); + ++ss->s_inuse; + ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); opc->smatches = sm; } else { /* if found send UPDATE else send ADD */ - ss->s_inuse++; syncprov_qresp( opc, ss, found ? LDAP_SYNC_MODIFY : LDAP_SYNC_ADD ); - ss->s_inuse--; } } else if ( !saveit && found ) { /* send DELETE */ @@ -1200,9 +1226,9 @@ syncprov_checkpoint( Operation *op, Slap syncprov_info_t *si = on->on_bi.bi_private; Modifications mod; Operation opm; + SlapReply rsm = { 0 }; struct berval bv[2]; slap_callback cb = {0}; - int manage = get_manageDSAit(op); mod.sml_values = bv; bv[1].bv_val = NULL; @@ -1222,8 +1248,12 @@ syncprov_checkpoint( Operation *op, Slap opm.o_req_ndn = op->o_bd->be_nsuffix[0]; opm.o_bd->bd_info = on->on_info->oi_orig; opm.o_managedsait = SLAP_CONTROL_NONCRITICAL; - opm.o_bd->be_modify( &opm, rs ); - opm.o_managedsait = manage; + SLAP_DBFLAGS( opm.o_bd ) |= SLAP_DBFLAG_NOLASTMOD; + opm.o_bd->be_modify( &opm, &rsm ); + SLAP_DBFLAGS( opm.o_bd ) ^= SLAP_DBFLAG_NOLASTMOD; + if ( mod.sml_next != NULL ) { + slap_mods_free( mod.sml_next, 1 ); + } } static void @@ -1770,6 +1800,9 @@ syncprov_search_response( Operation *op, return SLAP_CB_CONTINUE; } a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN ); + if ( a == NULL && rs->sr_operational_attrs != NULL ) { + a = attr_find( rs->sr_operational_attrs, slap_schema.si_ad_entryCSN ); + } if ( a ) { /* Make sure entry is less than the snaphot'd contextCSN */ if ( ber_bvcmp( &a->a_nvals[0], &ss->ss_ctxcsn ) > 0 ) @@ -1799,15 +1832,13 @@ syncprov_search_response( Operation *op, rs->sr_err = syncprov_done_ctrl( op, rs, rs->sr_ctrls, 0, 1, &cookie, ss->ss_present ? LDAP_SYNC_REFRESH_PRESENTS : LDAP_SYNC_REFRESH_DELETES ); + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); } else { /* It's RefreshAndPersist, transition to Persist phase */ syncprov_sendinfo( op, rs, ( ss->ss_present && rs->sr_nentries ) ? LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE, &cookie, 1, NULL, 0 ); - /* Flush any queued persist messages */ - if ( ss->ss_so->s_res ) { - syncprov_qplay( op, on, ss->ss_so ); - } + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); /* Detach this Op from frontend control */ ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex ); @@ -1932,12 +1963,11 @@ syncprov_op_search( Operation *op, SlapR /* Is the CSN still present in the database? */ if ( syncprov_findcsn( op, FIND_CSN ) != LDAP_SUCCESS ) { /* No, so a reload is required */ -#if 0 /* the consumer doesn't seem to send this hint */ - if ( op->o_sync_rhint == 0 ) { + /* the 2.2 consumer doesn't send this hint */ + if ( si->si_usehint && srs->sr_rhint == 0 ) { send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" ); return rs->sr_err; } -#endif } else { gotstate = 1; /* If changed and doing Present lookup, send Present UUIDs */ @@ -2058,7 +2088,8 @@ syncprov_operational( enum { SP_CHKPT = 1, SP_SESSL, - SP_NOPRES + SP_NOPRES, + SP_USEHINT }; static ConfigDriver sp_cf_gen; @@ -2076,6 +2107,10 @@ static ConfigTable spcfg[] = { sp_cf_gen, "( OLcfgOvAt:1.3 NAME 'olcSpNoPresent' " "DESC 'Omit Present phase processing' " "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL }, + { "syncprov-reloadhint", NULL, 2, 2, 0, ARG_ON_OFF|ARG_MAGIC|SP_USEHINT, + sp_cf_gen, "( OLcfgOvAt:1.4 NAME 'olcSpReloadHint' " + "DESC 'Observe Reload Hint in Request control' " + "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL }, { NULL, NULL, 0, 0, 0, ARG_IGNORED } }; @@ -2123,6 +2158,13 @@ sp_cf_gen(ConfigArgs *c) rc = 1; } break; + case SP_USEHINT: + if ( si->si_usehint ) { + c->value_int = 1; + } else { + rc = 1; + } + break; } return rc; } else if ( c->op == LDAP_MOD_DELETE ) { @@ -2143,13 +2185,42 @@ sp_cf_gen(ConfigArgs *c) else rc = LDAP_NO_SUCH_ATTRIBUTE; break; + case SP_USEHINT: + if ( si->si_usehint ) + si->si_usehint = 0; + else + rc = LDAP_NO_SUCH_ATTRIBUTE; + break; } return rc; } switch ( c->type ) { case SP_CHKPT: - si->si_chkops = atoi( c->argv[1] ); - si->si_chktime = atoi( c->argv[2] ) * 60; + if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) { + sprintf( c->msg, "%s unable to parse checkpoint ops # \"%s\"", + c->argv[0], c->argv[1] ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + if ( si->si_chkops <= 0 ) { + sprintf( c->msg, "%s invalid checkpoint ops # \"%d\"", + c->argv[0], si->si_chkops ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) { + sprintf( c->msg, "%s unable to parse checkpoint time \"%s\"", + c->argv[0], c->argv[1] ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + if ( si->si_chktime <= 0 ) { + sprintf( c->msg, "%s invalid checkpoint time \"%d\"", + c->argv[0], si->si_chkops ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + si->si_chktime *= 60; break; case SP_SESSL: { sessionlog *sl; @@ -2177,6 +2248,9 @@ sp_cf_gen(ConfigArgs *c) case SP_NOPRES: si->si_nopres = c->value_int; break; + case SP_USEHINT: + si->si_usehint = c->value_int; + break; } return rc; } @@ -2206,9 +2280,9 @@ syncprov_db_open( syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; Connection conn; - char opbuf[OPERATION_BUFFER_SIZE]; + OperationBuffer opbuf; char ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; - Operation *op = (Operation *)opbuf; + Operation *op = (Operation *) &opbuf; Entry *e; Attribute *a; int rc; @@ -2249,12 +2323,14 @@ syncprov_db_open( strcpy( ctxcsnbuf, si->si_ctxcsnbuf ); } be_entry_release_rw( op, e, 0 ); - op->o_bd->bd_info = (BackendInfo *)on; - op->o_req_dn = be->be_suffix[0]; - op->o_req_ndn = be->be_nsuffix[0]; - op->ors_scope = LDAP_SCOPE_SUBTREE; - ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op ); - ldap_pvt_thread_join( tid, NULL ); + if ( !BER_BVISEMPTY( &si->si_ctxcsn ) ) { + op->o_bd->bd_info = (BackendInfo *)on; + op->o_req_dn = be->be_suffix[0]; + op->o_req_ndn = be->be_nsuffix[0]; + op->ors_scope = LDAP_SCOPE_SUBTREE; + ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op ); + ldap_pvt_thread_join( tid, NULL ); + } } else if ( SLAP_SYNC_SHADOW( op->o_bd )) { /* If we're also a consumer, and we didn't find the context entry, * then don't generate anything, wait for our provider to send it @@ -2264,8 +2340,8 @@ syncprov_db_open( } if ( BER_BVISEMPTY( &si->si_ctxcsn ) ) { - slap_get_csn( op, si->si_ctxcsnbuf, sizeof(si->si_ctxcsnbuf), - &si->si_ctxcsn, 0 ); + si->si_ctxcsn.bv_len = sizeof( si->si_ctxcsnbuf ); + slap_get_csn( op, &si->si_ctxcsn, 0 ); } /* If our ctxcsn is different from what was read from the root @@ -2296,8 +2372,8 @@ syncprov_db_close( } if ( si->si_numops ) { Connection conn; - char opbuf[OPERATION_BUFFER_SIZE]; - Operation *op = (Operation *)opbuf; + OperationBuffer opbuf; + Operation *op = (Operation *) &opbuf; SlapReply rs = {REP_RESULT}; void *thrctx; @@ -2348,6 +2424,9 @@ syncprov_db_destroy( syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; if ( si ) { + if ( si->si_logs ) { + ch_free( si->si_logs ); + } ldap_pvt_thread_mutex_destroy( &si->si_mods_mutex ); ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex ); ldap_pvt_thread_mutex_destroy( &si->si_csn_mutex ); @@ -2424,6 +2503,7 @@ static int syncprov_parseCtrl ( rs->sr_text = "Sync control : cookie decoding error"; return LDAP_PROTOCOL_ERROR; } + tag = ber_peek_tag( ber, &len ); } if ( tag == LDAP_TAG_RELOAD_HINT ) { if (( ber_scanf( ber, /*{*/ "b", &rhint )) == LBER_ERROR ) { @@ -2465,7 +2545,7 @@ static int syncprov_parseCtrl ( static slap_overinst syncprov; int -syncprov_init() +syncprov_initialize() { int rc; @@ -2498,6 +2578,8 @@ syncprov_init() syncprov.on_bi.bi_cf_ocs = spocs; + generic_filter.f_desc = slap_schema.si_ad_objectClass; + rc = config_register_schema( spcfg, spocs ); if ( rc ) return rc; @@ -2508,7 +2590,7 @@ syncprov_init() int init_module( int argc, char *argv[] ) { - return syncprov_init(); + return syncprov_initialize(); } #endif /* SLAPD_OVER_SYNCPROV == SLAPD_MOD_DYNAMIC */