From 639d678592afb79eff17313282c3504c9b02638d Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Tue, 20 Mar 2007 01:07:10 +0000 Subject: [PATCH] cleanup struct declarations --- servers/slapd/abandon.c | 2 +- servers/slapd/at.c | 4 +- servers/slapd/back-meta/back-meta.h | 6 +- servers/slapd/back-monitor/back-monitor.h | 4 + servers/slapd/back-monitor/compare.c | 2 +- servers/slapd/back-relay/op.c | 42 +- servers/slapd/back-shell/shell.h | 10 +- servers/slapd/backend.c | 6 +- servers/slapd/cancel.c | 2 +- servers/slapd/connection.c | 2 +- servers/slapd/cr.c | 2 +- servers/slapd/mr.c | 4 +- servers/slapd/oc.c | 22 +- servers/slapd/oidm.c | 2 +- servers/slapd/operation.c | 2 +- servers/slapd/overlays/syncprov.c | 2 +- servers/slapd/proto-slap.h | 4 +- servers/slapd/schema_prep.c | 10 +- servers/slapd/sets.h | 2 +- servers/slapd/slap.h | 607 +++++++++++----------- servers/slapd/syncrepl.c | 68 +-- servers/slapd/syntax.c | 2 +- 22 files changed, 408 insertions(+), 399 deletions(-) diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c index bd09f3e811..f4a2cb3602 100644 --- a/servers/slapd/abandon.c +++ b/servers/slapd/abandon.c @@ -91,7 +91,7 @@ do_abandon( Operation *op, SlapReply *rs ) LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) { if ( o->o_msgid == id ) { LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, - o, slap_op, o_next ); + o, Operation, o_next ); LDAP_STAILQ_NEXT(o, o_next) = NULL; op->o_conn->c_n_ops_pending--; slap_op_free( o ); diff --git a/servers/slapd/at.c b/servers/slapd/at.c index 4538f5b5d4..047d649839 100644 --- a/servers/slapd/at.c +++ b/servers/slapd/at.c @@ -74,7 +74,7 @@ struct aindexrec { static Avlnode *attr_index = NULL; static Avlnode *attr_cache = NULL; -static LDAP_STAILQ_HEAD(ATList, slap_attribute_type) attr_list +static LDAP_STAILQ_HEAD(ATList, AttributeType) attr_list = LDAP_STAILQ_HEAD_INITIALIZER(attr_list); /* Last hardcoded attribute registered */ @@ -253,7 +253,7 @@ at_delete( AttributeType *at ) { at->sat_flags |= SLAP_AT_DELETED; - LDAP_STAILQ_REMOVE(&attr_list,at,slap_attribute_type,sat_next); + LDAP_STAILQ_REMOVE(&attr_list, at, AttributeType, sat_next); at_delete_names( at ); } diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h index 04d7ba885c..dbceee049e 100644 --- a/servers/slapd/back-meta/back-meta.h +++ b/servers/slapd/back-meta/back-meta.h @@ -31,6 +31,7 @@ /* String rewrite library */ #include "rewrite.h" + LDAP_BEGIN_DECL /* @@ -40,9 +41,6 @@ LDAP_BEGIN_DECL #define META_BACK_PRINT_CONNTREE 0 #endif /* !META_BACK_PRINT_CONNTREE */ -struct slap_conn; -struct slap_op; - /* from back-ldap.h before rwm removal */ struct ldapmap { int drop_missing; @@ -223,7 +221,7 @@ typedef struct metasingleconn_t { } metasingleconn_t; typedef struct metaconn_t { - struct slap_conn *mc_conn; + Connection *mc_conn; #define lc_conn mc_conn unsigned mc_refcnt; diff --git a/servers/slapd/back-monitor/back-monitor.h b/servers/slapd/back-monitor/back-monitor.h index 79bf085872..cfb5b80d58 100644 --- a/servers/slapd/back-monitor/back-monitor.h +++ b/servers/slapd/back-monitor/back-monitor.h @@ -285,6 +285,10 @@ typedef struct monitor_extra_t { monitor_subsys_t * (*get_subsys_by_dn)( struct berval *ndn, int sub ); int (*register_subsys)( monitor_subsys_t *ms ); + int (*register_backend)( BackendInfo *bi ); + int (*register_database)( BackendDB *be ); + int (*register_overlay_info)( slap_overinst *on ); + int (*register_overlay)( BackendDB *be ); int (*register_entry)( Entry *e, monitor_callback_t *cb, monitor_subsys_t *ms, unsigned long flags ); int (*register_entry_parent)( Entry *e, monitor_callback_t *cb, diff --git a/servers/slapd/back-monitor/compare.c b/servers/slapd/back-monitor/compare.c index 09eb118d23..3a8df66624 100644 --- a/servers/slapd/back-monitor/compare.c +++ b/servers/slapd/back-monitor/compare.c @@ -27,7 +27,7 @@ #include "back-monitor.h" int -monitor_back_compare( struct slap_op *op, struct slap_rep *rs) +monitor_back_compare( Operation *op, SlapReply *rs ) { monitor_info_t *mi = ( monitor_info_t * ) op->o_bd->be_private; Entry *e, *matched = NULL; diff --git a/servers/slapd/back-relay/op.c b/servers/slapd/back-relay/op.c index 0c463cc203..d082aeda44 100644 --- a/servers/slapd/back-relay/op.c +++ b/servers/slapd/back-relay/op.c @@ -26,7 +26,7 @@ #include "back-relay.h" static int -relay_back_swap_bd( struct slap_op *op, struct slap_rep *rs ) +relay_back_swap_bd( Operation *op, SlapReply *rs ) { slap_callback *cb = op->o_callback; BackendDB *be = op->o_bd; @@ -38,7 +38,7 @@ relay_back_swap_bd( struct slap_op *op, struct slap_rep *rs ) } static void -relay_back_add_cb( slap_callback *cb, struct slap_op *op ) +relay_back_add_cb( slap_callback *cb, Operation *op ) { cb->sc_next = op->o_callback; cb->sc_response = relay_back_swap_bd; @@ -55,7 +55,7 @@ relay_back_add_cb( slap_callback *cb, struct slap_op *op ) * any valid error send as error result */ static BackendDB * -relay_back_select_backend( struct slap_op *op, struct slap_rep *rs, int err ) +relay_back_select_backend( Operation *op, SlapReply *rs, int err ) { relay_back_info *ri = (relay_back_info *)op->o_bd->be_private; BackendDB *bd = ri->ri_bd; @@ -100,7 +100,7 @@ relay_back_select_backend( struct slap_op *op, struct slap_rep *rs, int err ) } int -relay_back_op_bind( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_bind( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -134,7 +134,7 @@ relay_back_op_bind( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_unbind( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_unbind( Operation *op, SlapReply *rs ) { relay_back_info *ri = (relay_back_info *)op->o_bd->be_private; BackendDB *bd; @@ -165,7 +165,7 @@ relay_back_op_unbind( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_search( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_search( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -200,7 +200,7 @@ relay_back_op_search( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_compare( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_compare( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -235,7 +235,7 @@ relay_back_op_compare( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_modify( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_modify( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -270,7 +270,7 @@ relay_back_op_modify( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_modrdn( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_modrdn( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -305,7 +305,7 @@ relay_back_op_modrdn( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_add( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_add( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -340,7 +340,7 @@ relay_back_op_add( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_delete( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_delete( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -370,7 +370,7 @@ relay_back_op_delete( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_abandon( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_abandon( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -400,7 +400,7 @@ relay_back_op_abandon( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_cancel( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_cancel( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -435,7 +435,7 @@ relay_back_op_cancel( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_op_extended( struct slap_op *op, struct slap_rep *rs ) +relay_back_op_extended( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 1; @@ -470,7 +470,7 @@ relay_back_op_extended( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_entry_release_rw( struct slap_op *op, Entry *e, int rw ) +relay_back_entry_release_rw( Operation *op, Entry *e, int rw ) { relay_back_info *ri = (relay_back_info *)op->o_bd->be_private; BackendDB *bd; @@ -497,7 +497,7 @@ relay_back_entry_release_rw( struct slap_op *op, Entry *e, int rw ) } int -relay_back_entry_get_rw( struct slap_op *op, struct berval *ndn, +relay_back_entry_get_rw( Operation *op, struct berval *ndn, ObjectClass *oc, AttributeDescription *at, int rw, Entry **e ) { relay_back_info *ri = (relay_back_info *)op->o_bd->be_private; @@ -532,7 +532,7 @@ relay_back_entry_get_rw( struct slap_op *op, struct berval *ndn, * naming context... mmmh. */ int -relay_back_chk_referrals( struct slap_op *op, struct slap_rep *rs ) +relay_back_chk_referrals( Operation *op, SlapReply *rs ) { BackendDB *bd; int rc = 0; @@ -574,7 +574,7 @@ relay_back_chk_referrals( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_operational( struct slap_op *op, struct slap_rep *rs ) +relay_back_operational( Operation *op, SlapReply *rs ) { relay_back_info *ri = (relay_back_info *)op->o_bd->be_private; BackendDB *bd; @@ -608,7 +608,7 @@ relay_back_operational( struct slap_op *op, struct slap_rep *rs ) } int -relay_back_has_subordinates( struct slap_op *op, Entry *e, int *hasSubs ) +relay_back_has_subordinates( Operation *op, Entry *e, int *hasSubs ) { relay_back_info *ri = (relay_back_info *)op->o_bd->be_private; BackendDB *bd; @@ -635,7 +635,7 @@ relay_back_has_subordinates( struct slap_op *op, Entry *e, int *hasSubs ) } int -relay_back_connection_init( BackendDB *bd, struct slap_conn *c ) +relay_back_connection_init( BackendDB *bd, Connection *c ) { relay_back_info *ri = (relay_back_info *)bd->be_private; @@ -652,7 +652,7 @@ relay_back_connection_init( BackendDB *bd, struct slap_conn *c ) } int -relay_back_connection_destroy( BackendDB *bd, struct slap_conn *c ) +relay_back_connection_destroy( BackendDB *bd, Connection *c ) { relay_back_info *ri = (relay_back_info *)bd->be_private; diff --git a/servers/slapd/back-shell/shell.h b/servers/slapd/back-shell/shell.h index 1540665173..ee4871b06b 100644 --- a/servers/slapd/back-shell/shell.h +++ b/servers/slapd/back-shell/shell.h @@ -46,10 +46,6 @@ struct shellinfo { char **si_delete; /* cmd + args to exec for delete */ }; -struct slap_backend_db; -struct slap_conn; -struct slap_op; - extern pid_t forkandexec LDAP_P(( char **args, FILE **rfp, @@ -57,11 +53,11 @@ extern pid_t forkandexec LDAP_P(( extern void print_suffixes LDAP_P(( FILE *fp, - struct slap_backend_db *bd)); + BackendDB *bd)); extern int read_and_send_results LDAP_P(( - struct slap_op *op, - struct slap_rep *rs, + Operation *op, + SlapReply *rs, FILE *fp)); LDAP_END_DECL diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index f7f214e187..35486ced58 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -418,7 +418,7 @@ backend_stopdown_one( BackendDB *bd ) void backend_destroy_one( BackendDB *bd, int dynamic ) { if ( dynamic ) { - LDAP_STAILQ_REMOVE(&backendDB, bd, slap_backend_db, be_next ); + LDAP_STAILQ_REMOVE(&backendDB, bd, BackendDB, be_next ); } if ( bd->be_syncinfo ) { @@ -560,7 +560,7 @@ backend_db_move( int idx ) { - LDAP_STAILQ_REMOVE(&backendDB, be, slap_backend_db, be_next); + LDAP_STAILQ_REMOVE(&backendDB, be, BackendDB, be_next); backend_db_insert(be, idx); } @@ -614,7 +614,7 @@ backend_db_init( fprintf( stderr, "database init failed (%s)\n", type ); /* If we created and linked this be, remove it and free it */ if ( !b0 ) { - LDAP_STAILQ_REMOVE(&backendDB, be, slap_backend_db, be_next); + LDAP_STAILQ_REMOVE(&backendDB, be, BackendDB, be_next); ch_free( be ); be = NULL; nbackends--; diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c index 08115f45ed..4d62a5a2c9 100644 --- a/servers/slapd/cancel.c +++ b/servers/slapd/cancel.c @@ -67,7 +67,7 @@ int cancel_extop( Operation *op, SlapReply *rs ) ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) { if ( o->o_msgid == opid ) { - LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, slap_op, o_next ); + LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, Operation, o_next ); LDAP_STAILQ_NEXT(o, o_next) = NULL; op->o_conn->c_n_ops_pending--; slap_op_free( o ); diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 062734c449..42f86865c6 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -1157,7 +1157,7 @@ operations_error: ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx_null ); - LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next); + LDAP_STAILQ_REMOVE( &conn->c_ops, op, Operation, o_next); LDAP_STAILQ_NEXT(op, o_next) = NULL; slap_op_free( op ); conn->c_n_ops_executing--; diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c index 5e40ce202b..e18c0125af 100644 --- a/servers/slapd/cr.c +++ b/servers/slapd/cr.c @@ -30,7 +30,7 @@ struct cindexrec { }; static Avlnode *cr_index = NULL; -static LDAP_STAILQ_HEAD(CRList, slap_content_rule) cr_list +static LDAP_STAILQ_HEAD(CRList, ContentRule) cr_list = LDAP_STAILQ_HEAD_INITIALIZER(cr_list); static int diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c index 85d60bf62c..49266e76d9 100644 --- a/servers/slapd/mr.c +++ b/servers/slapd/mr.c @@ -30,9 +30,9 @@ struct mindexrec { }; static Avlnode *mr_index = NULL; -static LDAP_SLIST_HEAD(MRList, slap_matching_rule) mr_list +static LDAP_SLIST_HEAD(MRList, MatchingRule) mr_list = LDAP_SLIST_HEAD_INITIALIZER(&mr_list); -static LDAP_SLIST_HEAD(MRUList, slap_matching_rule_use) mru_list +static LDAP_SLIST_HEAD(MRUList, MatchingRuleUse) mru_list = LDAP_SLIST_HEAD_INITIALIZER(&mru_list); static int diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c index ef52fc8695..42879ee76e 100644 --- a/servers/slapd/oc.c +++ b/servers/slapd/oc.c @@ -37,16 +37,16 @@ int is_object_subclass( sup->soc_oid, sub->soc_oid, sup == sub ); #endif - if( sup == sub ) { + if ( sup == sub ) { return 1; } - if( sub->soc_sups == NULL ) { + if ( sub->soc_sups == NULL ) { return 0; } - for( i=0; sub->soc_sups[i] != NULL; i++ ) { - if( is_object_subclass( sup, sub->soc_sups[i] ) ) { + for ( i = 0; sub->soc_sups[i] != NULL; i++ ) { + if ( is_object_subclass( sup, sub->soc_sups[i] ) ) { return 1; } } @@ -71,11 +71,11 @@ int is_entry_objectclass( assert( !( e == NULL || oc == NULL ) ); assert( ( flags & SLAP_OCF_MASK ) != SLAP_OCF_MASK ); - if( e == NULL || oc == NULL ) { + if ( e == NULL || oc == NULL ) { return 0; } - if( flags == SLAP_OCF_SET_FLAGS && ( e->e_ocflags & SLAP_OC__END ) ) + if ( flags == SLAP_OCF_SET_FLAGS && ( e->e_ocflags & SLAP_OC__END ) ) { /* flags are set, use them */ return (e->e_ocflags & oc->soc_flags & SLAP_OC__MASK) != 0; @@ -85,7 +85,7 @@ int is_entry_objectclass( * find objectClass attribute */ attr = attr_find( e->e_attrs, slap_schema.si_ad_objectClass ); - if( attr == NULL ) { + if ( attr == NULL ) { /* no objectClass attribute */ Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") " "no objectClass attribute\n", @@ -95,7 +95,7 @@ int is_entry_objectclass( return 0; } - for( bv=attr->a_vals; bv->bv_val; bv++ ) { + for ( bv = attr->a_vals; bv->bv_val; bv++ ) { ObjectClass *objectClass = oc_bvfind( bv ); if ( objectClass == NULL ) { @@ -132,7 +132,7 @@ struct oindexrec { static Avlnode *oc_index = NULL; static Avlnode *oc_cache = NULL; -static LDAP_STAILQ_HEAD(OCList, slap_object_class) oc_list +static LDAP_STAILQ_HEAD(OCList, ObjectClass) oc_list = LDAP_STAILQ_HEAD_INITIALIZER(oc_list); ObjectClass *oc_sys_tail; @@ -193,7 +193,7 @@ oc_bvfind( struct berval *ocname ) return( NULL ); } -static LDAP_STAILQ_HEAD(OCUList, slap_object_class) oc_undef_list +static LDAP_STAILQ_HEAD(OCUList, ObjectClass) oc_undef_list = LDAP_STAILQ_HEAD_INITIALIZER(oc_undef_list); ObjectClass * @@ -414,7 +414,7 @@ oc_delete( ObjectClass *oc ) { oc->soc_flags |= SLAP_OC_DELETED; - LDAP_STAILQ_REMOVE(&oc_list,oc,slap_object_class,soc_next); + LDAP_STAILQ_REMOVE(&oc_list, oc, ObjectClass, soc_next); oc_delete_names( oc ); } diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c index 646574a378..6b5c4c61ac 100644 --- a/servers/slapd/oidm.c +++ b/servers/slapd/oidm.c @@ -26,7 +26,7 @@ #include "lutil.h" #include "config.h" -static LDAP_STAILQ_HEAD(OidMacroList, slap_oid_macro) om_list +static LDAP_STAILQ_HEAD(OidMacroList, OidMacro) om_list = LDAP_STAILQ_HEAD_INITIALIZER(om_list); OidMacro *om_sys_tail; diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c index 601ab81259..978dd19af8 100644 --- a/servers/slapd/operation.c +++ b/servers/slapd/operation.c @@ -38,7 +38,7 @@ #endif static ldap_pvt_thread_mutex_t slap_op_mutex; -static LDAP_STAILQ_HEAD(s_o, slap_op) slap_free_ops; +static LDAP_STAILQ_HEAD(s_o, Operation) slap_free_ops; static time_t last_time; static int last_incr; diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 2b4268813a..18a3fe5586 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1030,7 +1030,7 @@ syncprov_drop_psearch( syncops *so, int lock ) ldap_pvt_thread_mutex_lock( &so->s_op->o_conn->c_mutex ); so->s_op->o_conn->c_n_ops_executing--; so->s_op->o_conn->c_n_ops_completed++; - LDAP_STAILQ_REMOVE( &so->s_op->o_conn->c_ops, so->s_op, slap_op, + LDAP_STAILQ_REMOVE( &so->s_op->o_conn->c_ops, so->s_op, Operation, o_next ); if ( lock ) ldap_pvt_thread_mutex_unlock( &so->s_op->o_conn->c_mutex ); diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index eb1d6d795d..6064c3b185 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -348,7 +348,7 @@ LDAP_SLAPD_F (int) be_slurp_update LDAP_P(( Operation *op )); LDAP_SLAPD_F (int) be_shadow_update LDAP_P(( Operation *op )); LDAP_SLAPD_F (int) be_isupdate_dn LDAP_P(( Backend *be, struct berval *ndn )); LDAP_SLAPD_F (struct berval *) be_root_dn LDAP_P(( Backend *be )); -LDAP_SLAPD_F (int) be_entry_get_rw LDAP_P(( struct slap_op *o, +LDAP_SLAPD_F (int) be_entry_get_rw LDAP_P(( Operation *o, struct berval *ndn, ObjectClass *oc, AttributeDescription *at, int rw, Entry **e )); LDAP_SLAPD_F (int) be_entry_release_rw LDAP_P(( @@ -1600,7 +1600,7 @@ LDAP_SLAPD_F( slap_mr_indexer_func ) octetStringIndexer; LDAP_SLAPD_F( slap_mr_filter_func ) octetStringFilter; LDAP_SLAPD_F( int ) numericoidValidate LDAP_P(( - struct slap_syntax *syntax, + Syntax *syntax, struct berval *in )); LDAP_SLAPD_F( int ) octetStringMatch LDAP_P(( int *matchp, diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index 43eb1be766..aec27c8f71 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -85,9 +85,9 @@ oidValidate( static int objectClassPretty( - struct slap_syntax *syntax, - struct berval * in, - struct berval * out, + Syntax *syntax, + struct berval *in, + struct berval *out, void *ctx ) { ObjectClass *oc; @@ -241,8 +241,8 @@ objectSubClassMatch( static int objectSubClassIndexer( slap_mask_t use, slap_mask_t mask, - struct slap_syntax *syntax, - struct slap_matching_rule *mr, + Syntax *syntax, + MatchingRule *mr, struct berval *prefix, BerVarray values, BerVarray *keysp, diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h index c63361432b..c42d8f4277 100644 --- a/servers/slapd/sets.h +++ b/servers/slapd/sets.h @@ -21,7 +21,7 @@ LDAP_BEGIN_DECL typedef struct slap_set_cookie { - struct slap_op *set_op; + Operation *set_op; } SetCookie; /* this routine needs to return the bervals instead of diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index f4c1cf7d1d..0eea23e8b4 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -304,7 +304,42 @@ enum { SLAP_SCHERR_LAST }; -typedef union slap_sockaddr { +/* forward declarations */ +typedef struct Syntax Syntax; +typedef struct MatchingRule MatchingRule; +typedef struct MatchingRuleUse MatchingRuleUse; +typedef struct MatchingRuleAssertion MatchingRuleAssertion; +typedef struct OidMacro OidMacro; +typedef struct ObjectClass ObjectClass; +typedef struct AttributeType AttributeType; +typedef struct AttributeDescription AttributeDescription; +typedef struct AttributeName AttributeName; +typedef struct ContentRule ContentRule; + +typedef struct AttributeAssertion AttributeAssertion; +typedef struct SubstringsAssertion SubstringsAssertion; +typedef struct Filter Filter; +typedef struct ValuesReturnFilter ValuesReturnFilter; +typedef struct Attribute Attribute; +#ifdef LDAP_COMP_MATCH +typedef struct ComponentData ComponentData; +typedef struct ComponentFilter ComponentFilter; +#endif + +typedef struct Entry Entry; +typedef struct Modification Modification; +typedef struct Modifications Modifications; +typedef struct LDAPModList LDAPModList; + +typedef struct BackendInfo BackendInfo; /* per backend type */ +typedef struct BackendDB BackendDB; /* per backend database */ + +typedef struct Connection Connection; +typedef struct Operation Operation; +typedef struct SlapReply SlapReply; +/* end of forward declarations */ + +typedef union Sockaddr { struct sockaddr sa_addr; struct sockaddr_in sa_in_addr; #ifdef LDAP_PF_INET6 @@ -320,25 +355,21 @@ typedef union slap_sockaddr { extern int slap_inet4or6; #endif -typedef struct slap_oid_macro { +struct OidMacro { struct berval som_oid; BerVarray som_names; BerVarray som_subs; #define SLAP_OM_HARDCODE 0x10000U /* This is hardcoded schema */ int som_flags; LDAP_STAILQ_ENTRY(slap_oid_macro) som_next; -} OidMacro; - -/* forward declarations */ -struct slap_syntax; -struct slap_matching_rule; +}; typedef int slap_syntax_validate_func LDAP_P(( - struct slap_syntax *syntax, + Syntax *syntax, struct berval * in)); typedef int slap_syntax_transform_func LDAP_P(( - struct slap_syntax *syntax, + Syntax *syntax, struct berval * in, struct berval * out, void *memctx)); @@ -349,7 +380,7 @@ typedef void* slap_component_transform_func LDAP_P(( struct ComponentDesc; #endif -typedef struct slap_syntax { +struct Syntax { LDAPSyntax ssyn_syn; #define ssyn_oid ssyn_syn.syn_oid #define ssyn_desc ssyn_syn.syn_desc @@ -390,8 +421,8 @@ typedef struct slap_syntax { struct ComponentDesc* ssync_comp_syntax; #endif - LDAP_SLIST_ENTRY(slap_syntax) ssyn_next; -} Syntax; + LDAP_SLIST_ENTRY(Syntax) ssyn_next; +}; #define slap_syntax_is_flag(s,flag) ((int)((s)->ssyn_flags & (flag)) ? 1 : 0) #define slap_syntax_is_blob(s) slap_syntax_is_flag((s),SLAP_SYNTAX_BLOB) @@ -419,27 +450,27 @@ typedef int slap_mr_convert_func LDAP_P(( /* Normalizer */ typedef int slap_mr_normalize_func LDAP_P(( slap_mask_t use, - struct slap_syntax *syntax, /* NULL if in is asserted value */ - struct slap_matching_rule *mr, - struct berval * in, - struct berval * out, + Syntax *syntax, /* NULL if in is asserted value */ + MatchingRule *mr, + struct berval *in, + struct berval *out, void *memctx )); /* Match (compare) function */ typedef int slap_mr_match_func LDAP_P(( int *match, slap_mask_t use, - struct slap_syntax *syntax, /* syntax of stored value */ - struct slap_matching_rule *mr, - struct berval * value, - void * assertValue )); + Syntax *syntax, /* syntax of stored value */ + MatchingRule *mr, + struct berval *value, + void *assertValue )); /* Index generation function */ typedef int slap_mr_indexer_func LDAP_P(( slap_mask_t use, slap_mask_t mask, - struct slap_syntax *syntax, /* syntax of stored value */ - struct slap_matching_rule *mr, + Syntax *syntax, /* syntax of stored value */ + MatchingRule *mr, struct berval *prefix, BerVarray values, BerVarray *keys, @@ -449,16 +480,14 @@ typedef int slap_mr_indexer_func LDAP_P(( typedef int slap_mr_filter_func LDAP_P(( slap_mask_t use, slap_mask_t mask, - struct slap_syntax *syntax, /* syntax of stored value */ - struct slap_matching_rule *mr, + Syntax *syntax, /* syntax of stored value */ + MatchingRule *mr, struct berval *prefix, - void * assertValue, + void *assertValue, BerVarray *keys, void *memctx )); -typedef struct slap_matching_rule_use MatchingRuleUse; - -typedef struct slap_matching_rule { +struct MatchingRule { LDAPMatchingRule smr_mrule; MatchingRuleUse *smr_mru; /* RFC 4512 string representation */ @@ -474,7 +503,7 @@ typedef struct slap_matching_rule { struct berval smr_bvoid; #define smr_oidlen smr_bvoid.bv_len - slap_mask_t smr_usage; + slap_mask_t smr_usage; #ifdef LDAP_DEVEL #define SLAP_MR_HIDE 0x0000U @@ -482,18 +511,18 @@ typedef struct slap_matching_rule { #define SLAP_MR_HIDE 0x8000U #endif -#define SLAP_MR_MUTATION_NORMALIZER 0x4000U +#define SLAP_MR_MUTATION_NORMALIZER 0x4000U #define SLAP_MR_TYPE_MASK 0x0F00U -#define SLAP_MR_SUBTYPE_MASK 0x00F0U +#define SLAP_MR_SUBTYPE_MASK 0x00F0U #define SLAP_MR_USAGE 0x000FU #define SLAP_MR_NONE 0x0000U #define SLAP_MR_EQUALITY 0x0100U #define SLAP_MR_ORDERING 0x0200U #define SLAP_MR_SUBSTR 0x0400U -#define SLAP_MR_EXT 0x0800U /* implicitly extensible */ -#define SLAP_MR_ORDERED_INDEX 0x1000U +#define SLAP_MR_EXT 0x0800U /* implicitly extensible */ +#define SLAP_MR_ORDERED_INDEX 0x1000U #ifdef LDAP_COMP_MATCH #define SLAP_MR_COMPONENT 0x2000U #endif @@ -501,7 +530,7 @@ typedef struct slap_matching_rule { #define SLAP_MR_EQUALITY_APPROX ( SLAP_MR_EQUALITY | 0x0010U ) #define SLAP_MR_SUBSTR_INITIAL ( SLAP_MR_SUBSTR | 0x0010U ) -#define SLAP_MR_SUBSTR_ANY ( SLAP_MR_SUBSTR | 0x0020U ) +#define SLAP_MR_SUBSTR_ANY ( SLAP_MR_SUBSTR | 0x0020U ) #define SLAP_MR_SUBSTR_FINAL ( SLAP_MR_SUBSTR | 0x0040U ) @@ -518,7 +547,7 @@ typedef struct slap_matching_rule { */ #define SLAP_MR_VALUE_OF_ASSERTION_SYNTAX 0x0001U #define SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX 0x0002U -#define SLAP_MR_VALUE_OF_SYNTAX 0x0003U +#define SLAP_MR_VALUE_OF_SYNTAX 0x0003U #define SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( usage ) \ ((usage) & SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX ) @@ -554,30 +583,30 @@ typedef struct slap_matching_rule { #define SLAP_IS_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH( usage ) \ ((usage) & SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH ) - Syntax *smr_syntax; + Syntax *smr_syntax; slap_mr_convert_func *smr_convert; slap_mr_normalize_func *smr_normalize; - slap_mr_match_func *smr_match; + slap_mr_match_func *smr_match; slap_mr_indexer_func *smr_indexer; - slap_mr_filter_func *smr_filter; + slap_mr_filter_func *smr_filter; /* * null terminated array of syntaxes compatible with this syntax * note: when MS_EXT is set, this MUST NOT contain the assertion * syntax of the rule. When MS_EXT is not set, it MAY. */ - Syntax **smr_compat_syntaxes; + Syntax **smr_compat_syntaxes; /* * For equality rules, refers to an associated approximate rule. * For non-equality rules, refers to an associated equality rule. */ - struct slap_matching_rule *smr_associated; + MatchingRule *smr_associated; #define SLAP_MR_ASSOCIATED(mr,amr) \ (((mr) == (amr)) || ((mr)->smr_associated == (amr))) - LDAP_SLIST_ENTRY(slap_matching_rule)smr_next; + LDAP_SLIST_ENTRY(MatchingRule) smr_next; #define smr_oid smr_mrule.mr_oid #define smr_names smr_mrule.mr_names @@ -585,15 +614,15 @@ typedef struct slap_matching_rule { #define smr_obsolete smr_mrule.mr_obsolete #define smr_syntax_oid smr_mrule.mr_syntax_oid #define smr_extensions smr_mrule.mr_extensions -} MatchingRule; +}; -struct slap_matching_rule_use { +struct MatchingRuleUse { LDAPMatchingRuleUse smru_mruleuse; MatchingRule *smru_mr; /* RFC 4512 string representation */ struct berval smru_str; - LDAP_SLIST_ENTRY(slap_matching_rule_use) smru_next; + LDAP_SLIST_ENTRY(MatchingRuleUse) smru_next; #define smru_oid smru_mruleuse.mru_oid #define smru_names smru_mruleuse.mru_names @@ -619,30 +648,26 @@ typedef struct slap_mrule_defs_rec { char * mrd_associated; } slap_mrule_defs_rec; -struct slap_backend_db; -struct slap_entry; -struct slap_attr; - typedef int (AttributeTypeSchemaCheckFN)( - struct slap_backend_db *be, - struct slap_entry *e, - struct slap_attr *attr, + BackendDB *be, + Entry *e, + Attribute *attr, const char** text, char *textbuf, size_t textlen ); -typedef struct slap_attribute_type { +struct AttributeType { LDAPAttributeType sat_atype; struct berval sat_cname; - struct slap_attribute_type *sat_sup; - struct slap_attribute_type **sat_subtypes; + AttributeType *sat_sup; + AttributeType **sat_subtypes; MatchingRule *sat_equality; MatchingRule *sat_approx; MatchingRule *sat_ordering; MatchingRule *sat_substr; - Syntax *sat_syntax; + Syntax *sat_syntax; AttributeTypeSchemaCheckFN *sat_check; - char *sat_oidmacro; + char *sat_oidmacro; #define SLAP_AT_NONE 0x0000U #define SLAP_AT_ABSTRACT 0x0100U /* cannot be instantiated */ @@ -660,31 +685,31 @@ typedef struct slap_attribute_type { #define SLAP_AT_ORDERED_SIB 0x0002U /* siblings are ordered */ #define SLAP_AT_ORDERED 0x0003U /* value has order index */ -#define SLAP_AT_HARDCODE 0x10000U /* hardcoded schema */ -#define SLAP_AT_DELETED 0x20000U +#define SLAP_AT_HARDCODE 0x10000U /* hardcoded schema */ +#define SLAP_AT_DELETED 0x20000U - slap_mask_t sat_flags; + slap_mask_t sat_flags; - LDAP_STAILQ_ENTRY(slap_attribute_type) sat_next; + LDAP_STAILQ_ENTRY(AttributeType) sat_next; #define sat_oid sat_atype.at_oid #define sat_names sat_atype.at_names #define sat_desc sat_atype.at_desc -#define sat_obsolete sat_atype.at_obsolete +#define sat_obsolete sat_atype.at_obsolete #define sat_sup_oid sat_atype.at_sup_oid -#define sat_equality_oid sat_atype.at_equality_oid -#define sat_ordering_oid sat_atype.at_ordering_oid -#define sat_substr_oid sat_atype.at_substr_oid -#define sat_syntax_oid sat_atype.at_syntax_oid -#define sat_single_value sat_atype.at_single_value -#define sat_collective sat_atype.at_collective -#define sat_no_user_mod sat_atype.at_no_user_mod +#define sat_equality_oid sat_atype.at_equality_oid +#define sat_ordering_oid sat_atype.at_ordering_oid +#define sat_substr_oid sat_atype.at_substr_oid +#define sat_syntax_oid sat_atype.at_syntax_oid +#define sat_single_value sat_atype.at_single_value +#define sat_collective sat_atype.at_collective +#define sat_no_user_mod sat_atype.at_no_user_mod #define sat_usage sat_atype.at_usage -#define sat_extensions sat_atype.at_extensions +#define sat_extensions sat_atype.at_extensions - struct slap_attr_desc *sat_ad; + AttributeDescription *sat_ad; ldap_pvt_thread_mutex_t sat_ad_mutex; -} AttributeType; +}; #define is_at_operational(at) ((at)->sat_usage) #define is_at_single_value(at) ((at)->sat_single_value) @@ -692,36 +717,34 @@ typedef struct slap_attribute_type { #define is_at_obsolete(at) ((at)->sat_obsolete) #define is_at_no_user_mod(at) ((at)->sat_no_user_mod) -struct slap_object_class; - typedef int (ObjectClassSchemaCheckFN)( - struct slap_backend_db *be, - struct slap_entry *e, - struct slap_object_class *oc, + BackendDB *be, + Entry *e, + ObjectClass *oc, const char** text, char *textbuf, size_t textlen ); -typedef struct slap_object_class { +struct ObjectClass { LDAPObjectClass soc_oclass; struct berval soc_cname; - struct slap_object_class **soc_sups; - AttributeType **soc_required; - AttributeType **soc_allowed; + ObjectClass **soc_sups; + AttributeType **soc_required; + AttributeType **soc_allowed; ObjectClassSchemaCheckFN *soc_check; - char *soc_oidmacro; - slap_mask_t soc_flags; + char *soc_oidmacro; + slap_mask_t soc_flags; #define soc_oid soc_oclass.oc_oid #define soc_names soc_oclass.oc_names #define soc_desc soc_oclass.oc_desc -#define soc_obsolete soc_oclass.oc_obsolete -#define soc_sup_oids soc_oclass.oc_sup_oids +#define soc_obsolete soc_oclass.oc_obsolete +#define soc_sup_oids soc_oclass.oc_sup_oids #define soc_kind soc_oclass.oc_kind -#define soc_at_oids_must soc_oclass.oc_at_oids_must -#define soc_at_oids_may soc_oclass.oc_at_oids_may -#define soc_extensions soc_oclass.oc_extensions +#define soc_at_oids_must soc_oclass.oc_at_oids_must +#define soc_at_oids_may soc_oclass.oc_at_oids_may +#define soc_extensions soc_oclass.oc_extensions - LDAP_STAILQ_ENTRY(slap_object_class) soc_next; -} ObjectClass; + LDAP_STAILQ_ENTRY(ObjectClass) soc_next; +}; #define SLAP_OCF_SET_FLAGS 0x1 #define SLAP_OCF_CHECK_SUP 0x2 @@ -749,55 +772,55 @@ typedef struct slap_object_class { /* * DIT content rule */ -typedef struct slap_content_rule { +struct ContentRule { LDAPContentRule scr_crule; - ObjectClass *scr_sclass; - ObjectClass **scr_auxiliaries; /* optional */ + ObjectClass *scr_sclass; + ObjectClass **scr_auxiliaries; /* optional */ AttributeType **scr_required; /* optional */ AttributeType **scr_allowed; /* optional */ AttributeType **scr_precluded; /* optional */ -#define scr_oid scr_crule.cr_oid -#define scr_names scr_crule.cr_names -#define scr_desc scr_crule.cr_desc +#define scr_oid scr_crule.cr_oid +#define scr_names scr_crule.cr_names +#define scr_desc scr_crule.cr_desc #define scr_obsolete scr_crule.cr_obsolete #define scr_oc_oids_aux scr_crule.cr_oc_oids_aux #define scr_at_oids_must scr_crule.cr_at_oids_must #define scr_at_oids_may scr_crule.cr_at_oids_may #define scr_at_oids_not scr_crule.cr_at_oids_not - char *scr_oidmacro; -#define SLAP_CR_HARDCODE 0x10000U - int scr_flags; + char *scr_oidmacro; +#define SLAP_CR_HARDCODE 0x10000U + int scr_flags; - LDAP_STAILQ_ENTRY( slap_content_rule ) scr_next; -} ContentRule; + LDAP_STAILQ_ENTRY( ContentRule ) scr_next; +}; /* Represents a recognized attribute description ( type + options ). */ -typedef struct slap_attr_desc { - struct slap_attr_desc *ad_next; - AttributeType *ad_type; /* attribute type, must be specified */ - struct berval ad_cname; /* canonical name, must be specified */ - struct berval ad_tags; /* empty if no tagging options */ +struct AttributeDescription { + AttributeDescription *ad_next; + AttributeType *ad_type; /* attribute type, must be specified */ + struct berval ad_cname; /* canonical name, must be specified */ + struct berval ad_tags; /* empty if no tagging options */ unsigned ad_flags; -#define SLAP_DESC_NONE 0x00U -#define SLAP_DESC_BINARY 0x01U -#define SLAP_DESC_TAG_RANGE 0x80U -#define SLAP_DESC_TEMPORARY 0x1000U -} AttributeDescription; +#define SLAP_DESC_NONE 0x00U +#define SLAP_DESC_BINARY 0x01U +#define SLAP_DESC_TAG_RANGE 0x80U +#define SLAP_DESC_TEMPORARY 0x1000U +}; /* flags to slap_*2undef_ad to register undefined (0, the default) * or proxied (SLAP_AD_PROXIED) AttributeDescriptions; the additional * SLAP_AD_NOINSERT is to lookup without insert */ -#define SLAP_AD_UNDEF 0x00U -#define SLAP_AD_PROXIED 0x01U -#define SLAP_AD_NOINSERT 0x02U - -typedef struct slap_attr_name { - struct berval an_name; - AttributeDescription *an_desc; - int an_oc_exclude; - ObjectClass *an_oc; -} AttributeName; +#define SLAP_AD_UNDEF 0x00U +#define SLAP_AD_PROXIED 0x01U +#define SLAP_AD_NOINSERT 0x02U + +struct AttributeName { + struct berval an_name; + AttributeDescription *an_desc; + int an_oc_exclude; + ObjectClass *an_oc; +}; #define slap_ad_is_tagged(ad) ( (ad)->ad_tags.bv_len != 0 ) #define slap_ad_is_tag_range(ad) \ @@ -940,40 +963,36 @@ struct slap_internal_schema { Syntax *si_syn_objectClassDesc; }; -typedef struct slap_attr_assertion { +struct AttributeAssertion { AttributeDescription *aa_desc; - struct berval aa_value; + struct berval aa_value; #ifdef LDAP_COMP_MATCH - struct slap_component_filter *aa_cf;/* for attribute aliasing */ + ComponentFilter *aa_cf; /* for attribute aliasing */ #endif -} AttributeAssertion; +}; -typedef struct slap_ss_assertion { +struct SubstringsAssertion { AttributeDescription *sa_desc; struct berval sa_initial; struct berval *sa_any; struct berval sa_final; -} SubstringsAssertion; - -#ifdef LDAP_COMP_MATCH -struct slap_component_filter; -#endif +}; -typedef struct slap_mr_assertion { +struct MatchingRuleAssertion { MatchingRule *ma_rule; /* optional */ - struct berval ma_rule_text; /* optional */ + struct berval ma_rule_text; /* optional */ AttributeDescription *ma_desc; /* optional */ - int ma_dnattrs; /* boolean */ + int ma_dnattrs; /* boolean */ struct berval ma_value; /* required */ #ifdef LDAP_COMP_MATCH - struct slap_component_filter* ma_cf; /* component filter */ + ComponentFilter *ma_cf; /* component filter */ #endif -} MatchingRuleAssertion; +}; /* * represents a search filter */ -typedef struct slap_filter { +struct Filter { ber_tag_t f_choice; /* values taken from ldap.h, plus: */ #define SLAPD_FILTER_COMPUTED 0 #define SLAPD_FILTER_MASK 0x7fff @@ -981,19 +1000,19 @@ typedef struct slap_filter { union f_un_u { /* precomputed result */ - ber_int_t f_un_result; + ber_int_t f_un_result; /* present */ - AttributeDescription *f_un_desc; + AttributeDescription *f_un_desc; /* simple value assertion */ - AttributeAssertion *f_un_ava; + AttributeAssertion *f_un_ava; /* substring assertion */ - SubstringsAssertion *f_un_ssa; + SubstringsAssertion *f_un_ssa; /* matching rule assertion */ - MatchingRuleAssertion *f_un_mra; + MatchingRuleAssertion *f_un_mra; #define f_desc f_un.f_un_desc #define f_ava f_un.f_un_ava @@ -1001,18 +1020,18 @@ typedef struct slap_filter { #define f_av_value f_un.f_un_ava->aa_value #define f_sub f_un.f_un_ssa #define f_sub_desc f_un.f_un_ssa->sa_desc -#define f_sub_initial f_un.f_un_ssa->sa_initial +#define f_sub_initial f_un.f_un_ssa->sa_initial #define f_sub_any f_un.f_un_ssa->sa_any #define f_sub_final f_un.f_un_ssa->sa_final #define f_mra f_un.f_un_mra #define f_mr_rule f_un.f_un_mra->ma_rule -#define f_mr_rule_text f_un.f_un_mra->ma_rule_text +#define f_mr_rule_text f_un.f_un_mra->ma_rule_text #define f_mr_desc f_un.f_un_mra->ma_desc #define f_mr_value f_un.f_un_mra->ma_value -#define f_mr_dnattrs f_un.f_un_mra->ma_dnattrs +#define f_mr_dnattrs f_un.f_un_mra->ma_dnattrs /* and, or, not */ - struct slap_filter *f_un_complex; + Filter *f_un_complex; } f_un; #define f_result f_un.f_un_result @@ -1021,13 +1040,13 @@ typedef struct slap_filter { #define f_not f_un.f_un_complex #define f_list f_un.f_un_complex - struct slap_filter *f_next; -} Filter; + Filter *f_next; +}; /* compare routines can return undefined */ #define SLAPD_COMPARE_UNDEFINED ((ber_int_t) -1) -typedef struct slap_valuesreturnfilter { +struct ValuesReturnFilter { ber_tag_t vrf_choice; union vrf_un_u { @@ -1071,34 +1090,26 @@ typedef struct slap_valuesreturnfilter { } vrf_un; - struct slap_valuesreturnfilter *vrf_next; -} ValuesReturnFilter; - -#ifdef LDAP_COMP_MATCH -struct slap_component_syntax_info; -typedef struct slap_component_data { - void* cd_mem_op;/* nibble memory handler */ - struct slap_component_syntax_info** cd_tree;/* component tree */ -} ComponentData; -#endif + ValuesReturnFilter *vrf_next; +}; /* * represents an attribute (description + values) */ -typedef struct slap_attr { - AttributeDescription *a_desc; - BerVarray a_vals; /* preserved values */ - BerVarray a_nvals; /* normalized values */ +struct Attribute { + AttributeDescription *a_desc; + BerVarray a_vals; /* preserved values */ + BerVarray a_nvals; /* normalized values */ #ifdef LDAP_COMP_MATCH - ComponentData *a_comp_data; /* component values */ + ComponentData *a_comp_data; /* component values */ #endif - struct slap_attr *a_next; - unsigned a_flags; -#define SLAP_ATTR_IXADD 0x1U -#define SLAP_ATTR_IXDEL 0x2U + Attribute *a_next; + unsigned a_flags; +#define SLAP_ATTR_IXADD 0x1U +#define SLAP_ATTR_IXDEL 0x2U #define SLAP_ATTR_DONT_FREE_DATA 0x4U #define SLAP_ATTR_DONT_FREE_VALS 0x8U -} Attribute; +}; /* @@ -1107,7 +1118,7 @@ typedef struct slap_attr { typedef unsigned long ID; #define NOID ((ID)~0) -typedef struct slap_entry_header { +typedef struct EntryHeader { struct berval bv; char *data; int nattrs; @@ -1117,7 +1128,7 @@ typedef struct slap_entry_header { /* * represents an entry in core */ -typedef struct slap_entry { +struct Entry { /* * The ID field should only be changed before entry is * inserted into a cache. The ID value is backend @@ -1140,12 +1151,12 @@ typedef struct slap_entry { /* for use by the backend for any purpose */ void* e_private; -} Entry; +}; /* * A list of LDAPMods */ -typedef struct slap_mod { +struct Modification { short sm_op; short sm_flags; /* Set for internal mods, will bypass ACL checks. Only needed when @@ -1158,31 +1169,31 @@ typedef struct slap_mod { struct berval sm_type; BerVarray sm_values; BerVarray sm_nvalues; -} Modification; +}; -typedef struct slap_mod_list { - Modification sml_mod; +struct Modifications { + Modification sml_mod; #define sml_op sml_mod.sm_op #define sml_flags sml_mod.sm_flags #define sml_desc sml_mod.sm_desc #define sml_type sml_mod.sm_type #define sml_values sml_mod.sm_values #define sml_nvalues sml_mod.sm_nvalues - struct slap_mod_list *sml_next; -} Modifications; + Modifications *sml_next; +}; -typedef struct slap_ldap_modlist { - LDAPMod ml_mod; - struct slap_ldap_modlist *ml_next; +struct LDAPModList { + LDAPMod ml_mod; + LDAPModList *ml_next; #define ml_op ml_mod.mod_op #define ml_type ml_mod.mod_type #define ml_values ml_mod.mod_values -} LDAPModList; +}; /* * represents an access control list */ -typedef enum slap_access_e { +typedef enum slap_access_t { ACL_INVALID_ACCESS = -1, ACL_NONE = 0, ACL_DISCLOSE, @@ -1235,7 +1246,7 @@ typedef enum slap_style_e { ACL_STYLE_PATH } slap_style_t; -typedef struct slap_authz_info { +typedef struct AuthorizationInformation { ber_tag_t sai_method; /* LDAP_AUTH_* from */ struct berval sai_mech; /* SASL Mechanism */ struct berval sai_dn; /* DN for reporting purposes */ @@ -1248,9 +1259,7 @@ typedef struct slap_authz_info { slap_ssf_t sai_sasl_ssf; /* SASL SSF */ } AuthorizationInformation; - #ifdef SLAP_DYNACL -struct slap_op; /* * "dynamic" ACL infrastructure (for ACIs and more) @@ -1260,7 +1269,7 @@ typedef int (slap_dynacl_parse) LDAP_P(( const char *fname, int lineno, typedef int (slap_dynacl_unparse) LDAP_P(( void *priv, struct berval *bv )); typedef int (slap_dynacl_mask) LDAP_P(( void *priv, - struct slap_op *op, + Operation *op, Entry *e, AttributeDescription *desc, struct berval *val, @@ -1297,7 +1306,7 @@ typedef struct slap_dn_access { } slap_dn_access; /* the "by" part */ -typedef struct slap_access { +typedef struct Access { slap_control_t a_type; /* strip qualifiers */ @@ -1454,14 +1463,14 @@ typedef struct slap_access { /* ACL Groups */ slap_style_t a_group_style; struct berval a_group_pat; - ObjectClass *a_group_oc; + ObjectClass *a_group_oc; AttributeDescription *a_group_at; - struct slap_access *a_next; + struct Access *a_next; } Access; /* the "to" part */ -typedef struct slap_acl { +typedef struct AccessControl { /* "to" part: the entries this acl applies to */ Filter *acl_filter; slap_style_t acl_dn_style; @@ -1476,7 +1485,7 @@ typedef struct slap_acl { /* "by" part: list of who has what access to the entries */ Access *acl_access; - struct slap_acl *acl_next; + struct AccessControl *acl_next; } AccessControl; typedef enum { @@ -1486,7 +1495,7 @@ typedef enum { ACL_STATE_RECORDED = ( ACL_STATE_RECORDED_VD | ACL_STATE_RECORDED_NV ) } slap_acl_state_t; -typedef struct slap_acl_state { +typedef struct AccessControlState { /* Access state */ AccessControl *as_vi_acl; AccessControl *as_vd_acl; @@ -1505,10 +1514,8 @@ typedef struct slap_acl_state { * represents a backend */ -typedef struct slap_backend_info BackendInfo; /* per backend type */ -typedef struct slap_backend_db BackendDB; /* per backend database */ -typedef LDAP_STAILQ_HEAD(BeI, slap_backend_info) slap_bi_head; -typedef LDAP_STAILQ_HEAD(BeDB, slap_backend_db) slap_be_head; +typedef LDAP_STAILQ_HEAD(BeI, BackendInfo) slap_bi_head; +typedef LDAP_STAILQ_HEAD(BeDB, BackendDB) slap_be_head; LDAP_SLAPD_V (int) nBackendInfo; LDAP_SLAPD_V (int) nBackendDB; @@ -1677,7 +1684,7 @@ LDAP_TAILQ_HEAD( be_pcl, slap_csn_entry ); struct ConfigOCs; /* config.h */ -struct slap_backend_db { +struct BackendDB { BackendInfo *bd_info; /* pointer to shared backend info */ /* fields in this structure (and routines acting on this structure) @@ -1866,12 +1873,9 @@ struct slap_backend_db { struct ConfigOCs *be_cf_ocs; void *be_private; /* anything the backend database needs */ - LDAP_STAILQ_ENTRY(slap_backend_db) be_next; + LDAP_STAILQ_ENTRY(BackendDB) be_next; }; -struct slap_conn; -struct slap_op; - /* Backend function typedefs */ typedef int (BI_bi_func) LDAP_P((BackendInfo *bi)); typedef BI_bi_func BI_init; @@ -2000,7 +2004,7 @@ typedef struct rep_search_s { BerVarray r_v2ref; } rep_search_s; -typedef struct slap_rep { +struct SlapReply { slap_reply_t sr_type; ber_tag_t sr_tag; ber_int_t sr_msgid; @@ -2029,7 +2033,7 @@ typedef struct slap_rep { #define REP_NO_ENTRYDN 0x1000U #define REP_NO_SUBSCHEMA 0x2000U #define REP_NO_OPERATIONALS (REP_NO_ENTRYDN|REP_NO_SUBSCHEMA) -} SlapReply; +}; /* short hands for response members */ #define sr_attrs sr_un.sru_search.r_attrs @@ -2042,7 +2046,7 @@ typedef struct slap_rep { #define sr_rspdata sr_un.sru_extended.r_rspdata #define sr_sasldata sr_un.sru_sasl.r_sasldata -typedef int (BI_op_func) LDAP_P(( struct slap_op *op, struct slap_rep *rs )); +typedef int (BI_op_func) LDAP_P(( Operation *op, SlapReply *rs )); typedef BI_op_func BI_op_bind; typedef BI_op_func BI_op_unbind; typedef BI_op_func BI_op_search; @@ -2057,23 +2061,23 @@ typedef BI_op_func BI_op_extended; typedef BI_op_func BI_chk_referrals; typedef BI_op_func BI_chk_controls; typedef int (BI_entry_release_rw) - LDAP_P(( struct slap_op *op, Entry *e, int rw )); -typedef int (BI_entry_get_rw) LDAP_P(( struct slap_op *op, struct berval *ndn, + LDAP_P(( Operation *op, Entry *e, int rw )); +typedef int (BI_entry_get_rw) LDAP_P(( Operation *op, struct berval *ndn, ObjectClass *oc, AttributeDescription *at, int rw, Entry **e )); -typedef int (BI_operational) LDAP_P(( struct slap_op *op, struct slap_rep *rs )); -typedef int (BI_has_subordinates) LDAP_P(( struct slap_op *op, +typedef int (BI_operational) LDAP_P(( Operation *op, SlapReply *rs )); +typedef int (BI_has_subordinates) LDAP_P(( Operation *op, Entry *e, int *hasSubs )); -typedef int (BI_access_allowed) LDAP_P(( struct slap_op *op, Entry *e, +typedef int (BI_access_allowed) LDAP_P(( Operation *op, Entry *e, AttributeDescription *desc, struct berval *val, slap_access_t access, AccessControlState *state, slap_mask_t *maskp )); -typedef int (BI_acl_group) LDAP_P(( struct slap_op *op, Entry *target, +typedef int (BI_acl_group) LDAP_P(( Operation *op, Entry *target, struct berval *gr_ndn, struct berval *op_ndn, ObjectClass *group_oc, AttributeDescription *group_at )); -typedef int (BI_acl_attribute) LDAP_P(( struct slap_op *op, Entry *target, +typedef int (BI_acl_attribute) LDAP_P(( Operation *op, Entry *target, struct berval *entry_ndn, AttributeDescription *entry_at, BerVarray *vals, slap_access_t access )); -typedef int (BI_conn_func) LDAP_P(( BackendDB *bd, struct slap_conn *c )); +typedef int (BI_conn_func) LDAP_P(( BackendDB *bd, Connection *c )); typedef BI_conn_func BI_connection_init; typedef BI_conn_func BI_connection_destroy; @@ -2091,7 +2095,7 @@ typedef int (BI_tool_id2entry_get) LDAP_P(( BackendDB *be, ID id, Entry **e )); typedef ID (BI_tool_entry_modify) LDAP_P(( BackendDB *be, Entry *e, struct berval *text )); -struct slap_backend_info { +struct BackendInfo { char *bi_type; /* type of backend */ /* @@ -2235,28 +2239,28 @@ struct slap_backend_info { char **bi_obsolete_names; void *bi_extra; /* backend type-specific APIs */ void *bi_private; /* backend type-specific config data */ - LDAP_STAILQ_ENTRY(slap_backend_info) bi_next ; + LDAP_STAILQ_ENTRY(BackendInfo) bi_next ; }; #define c_authtype c_authz.sai_method #define c_authmech c_authz.sai_mech #define c_dn c_authz.sai_dn #define c_ndn c_authz.sai_ndn -#define c_ssf c_authz.sai_ssf +#define c_ssf c_authz.sai_ssf #define c_transport_ssf c_authz.sai_transport_ssf -#define c_tls_ssf c_authz.sai_tls_ssf -#define c_sasl_ssf c_authz.sai_sasl_ssf +#define c_tls_ssf c_authz.sai_tls_ssf +#define c_sasl_ssf c_authz.sai_sasl_ssf #define o_authtype o_authz.sai_method #define o_authmech o_authz.sai_mech #define o_dn o_authz.sai_dn #define o_ndn o_authz.sai_ndn -#define o_ssf o_authz.sai_ssf +#define o_ssf o_authz.sai_ssf #define o_transport_ssf o_authz.sai_transport_ssf -#define o_tls_ssf o_authz.sai_tls_ssf -#define o_sasl_ssf o_authz.sai_sasl_ssf +#define o_tls_ssf o_authz.sai_tls_ssf +#define o_sasl_ssf o_authz.sai_sasl_ssf -typedef int (slap_response)( struct slap_op *, struct slap_rep * ); +typedef int (slap_response)( Operation *, SlapReply * ); typedef struct slap_callback { struct slap_callback *sc_next; @@ -2308,7 +2312,7 @@ typedef struct slap_overinfo { * Paged Results state */ typedef unsigned long PagedResultsCookie; -typedef struct slap_paged_state { +typedef struct PagedResultsState { Backend *ps_be; ber_int_t ps_size; PagedResultsCookie ps_cookie; @@ -2328,8 +2332,8 @@ struct slap_csn_entry { /* * Caches the result of a backend_group check for ACL evaluation */ -typedef struct slap_gacl { - struct slap_gacl *ga_next; +typedef struct GroupAssertion { + struct GroupAssertion *ga_next; Backend *ga_be; ObjectClass *ga_oc; AttributeDescription *ga_at; @@ -2367,10 +2371,10 @@ struct slap_control_ids { /* * represents an operation pending from an ldap client */ -typedef struct slap_op_header { - unsigned long oh_opid; /* id of this operation */ - unsigned long oh_connid; /* id of conn initiating this op */ - struct slap_conn *oh_conn; /* connection spawning this op */ +typedef struct Opheader { + unsigned long oh_opid; /* id of this operation */ + unsigned long oh_connid; /* id of conn initiating this op */ + Connection *oh_conn; /* connection spawning this op */ ber_int_t oh_msgid; /* msgid of the request */ ber_int_t oh_protocol; /* version of the LDAP protocol used by client */ @@ -2388,7 +2392,7 @@ typedef struct slap_op_header { #endif } Opheader; -typedef union slap_op_request { +typedef union OpRequest { req_add_s oq_add; req_bind_s oq_bind; req_compare_s oq_compare; @@ -2401,7 +2405,7 @@ typedef union slap_op_request { req_pwdexop_s oq_pwdexop; } OpRequest; -typedef struct slap_op { +struct Operation { Opheader *o_hdr; #define o_opid o_hdr->oh_opid @@ -2581,8 +2585,8 @@ typedef struct slap_op { void *o_private; /* anything the backend needs */ - LDAP_STAILQ_ENTRY(slap_op) o_next; /* next operation in list */ -} Operation; + LDAP_STAILQ_ENTRY(Operation) o_next; /* next operation in list */ +}; #define OPERATION_BUFFER_SIZE ( sizeof(Operation) + sizeof(Opheader) + \ SLAP_MAX_CIDS*sizeof(void *) ) @@ -2600,15 +2604,15 @@ typedef LBER_ALIGNED_BUFFER(operation_buffer_u,OPERATION_BUFFER_SIZE) } while (0) typedef void (SEND_LDAP_RESULT)( - struct slap_op *op, struct slap_rep *rs); + Operation *op, SlapReply *rs); typedef int (SEND_SEARCH_ENTRY)( - struct slap_op *op, struct slap_rep *rs); + Operation *op, SlapReply *rs); typedef int (SEND_SEARCH_REFERENCE)( - struct slap_op *op, struct slap_rep *rs); + Operation *op, SlapReply *rs); typedef void (SEND_LDAP_EXTENDED)( - struct slap_op *op, struct slap_rep *rs); + Operation *op, SlapReply *rs); typedef void (SEND_LDAP_INTERMEDIATE)( - struct slap_op *op, struct slap_rep *rs); + Operation *op, SlapReply *rs); #define send_ldap_result( op, rs ) \ ((op)->o_conn->c_send_ldap_result)( op, rs ) @@ -2626,7 +2630,7 @@ typedef struct slap_listener Listener; /* * represents a connection from an ldap client */ -typedef struct slap_conn { +struct Connection { int c_struct_state; /* structure management state */ int c_conn_state; /* connection state */ int c_conn_idx; /* slot in connections array */ @@ -2667,8 +2671,8 @@ typedef struct slap_conn { ber_int_t c_protocol; /* version of the LDAP protocol used by client */ - LDAP_STAILQ_HEAD(c_o, slap_op) c_ops; /* list of operations being processed */ - LDAP_STAILQ_HEAD(c_po, slap_op) c_pending_ops; /* list of pending operations */ + LDAP_STAILQ_HEAD(c_o, Operation) c_ops; /* list of operations being processed */ + LDAP_STAILQ_HEAD(c_po, Operation) c_pending_ops; /* list of pending operations */ ldap_pvt_thread_mutex_t c_write_mutex; /* only one pdu written at a time */ ldap_pvt_thread_cond_t c_write_cv; /* used to wait for sd write-ready*/ @@ -2692,7 +2696,7 @@ typedef struct slap_conn { void *c_sasl_authctx; /* SASL authentication context */ void *c_sasl_sockctx; /* SASL security layer context */ void *c_sasl_extra; /* SASL session extra stuff */ - struct slap_op *c_sasl_bindop; /* set to current op if it's a bind */ + Operation *c_sasl_bindop; /* set to current op if it's a bind */ #ifdef LDAP_X_TXN #define CONN_TXN_INACTIVE 0 @@ -2701,7 +2705,7 @@ typedef struct slap_conn { int c_txn; Backend *c_txn_backend; - LDAP_STAILQ_HEAD(c_to, slap_op) c_txn_ops; /* list of operations in txn */ + LDAP_STAILQ_HEAD(c_to, Operation) c_txn_ops; /* list of operations in txn */ #endif PagedResultsState c_pagedresults_state; /* paged result state */ @@ -2733,7 +2737,7 @@ typedef struct slap_conn { SEND_SEARCH_REFERENCE *c_send_search_reference; SEND_LDAP_EXTENDED *c_send_ldap_extended; SEND_LDAP_INTERMEDIATE *c_send_ldap_intermediate; -} Connection; +}; #ifdef LDAP_DEBUG #ifdef LDAP_SYSLOG @@ -2903,9 +2907,21 @@ typedef int (*SLAP_ENTRY_INFO_FN) LDAP_P(( void *arg, Entry *e )); #define LDAP_COMP_FILTER_ITEM ((ber_tag_t) 0xa3U) #define LDAP_COMP_FILTER_UNDEFINED ((ber_tag_t) 0xa4U) -typedef struct slap_component_id { - int ci_type; - struct slap_component_id *ci_next; +typedef struct ComponentId ComponentId; +typedef struct ComponentReference ComponentReference; +typedef struct ComponentAssertion ComponentAssertion; +typedef struct ComponentAssertionValue ComponentAssertionValue; +typedef struct ComponentSyntaxInfo ComponentSyntaxInfo; +typedef struct ComponentDesc ComponentDesc; + +struct ComponentData { + void *cd_mem_op; /* nibble memory handler */ + ComponentSyntaxInfo** cd_tree; /* component tree */ +}; + +struct ComponentId { + int ci_type; + ComponentId *ci_next; union comp_id_value{ BerValue ci_identifier; @@ -2916,9 +2932,9 @@ typedef struct slap_component_id { BerValue ci_select_value; char ci_all; } ci_val; -} ComponentId; +}; -typedef struct slap_component_reference { +struct ComponentReference { ComponentId *cr_list; ComponentId *cr_curr; struct berval cr_string; @@ -2928,25 +2944,25 @@ typedef struct slap_component_reference { slap_mask_t cr_indexmask; AttributeDescription* cr_ad; BerVarray cr_nvals; - struct slap_component_reference* cr_next; -} ComponentReference; + ComponentReference* cr_next; +}; -typedef struct slap_component_assertion { +struct ComponentAssertion { ComponentReference *ca_comp_ref; ber_int_t ca_use_def; MatchingRule *ca_ma_rule; struct berval ca_ma_value; ComponentData ca_comp_data; /* componentized assertion */ - struct slap_component_filter *ca_cf; + ComponentFilter *ca_cf; MatchingRuleAssertion *ca_mra; -} ComponentAssertion; +}; -typedef struct slap_component_filter { - ber_tag_t cf_choice; +struct ComponentFilter { + ber_tag_t cf_choice; union cf_un_u { - ber_int_t cf_un_result; - ComponentAssertion *cf_un_ca; - struct slap_component_filter *cf_un_complex; + ber_int_t cf_un_result; + ComponentAssertion *cf_un_ca; + ComponentFilter *cf_un_complex; } cf_un; #define cf_ca cf_un.cf_un_ca @@ -2956,25 +2972,23 @@ typedef struct slap_component_filter { #define cf_not cf_un.cf_un_complex #define cf_any cf_un.cf_un_complex - struct slap_component_filter *cf_next; -} ComponentFilter; + ComponentFilter *cf_next; +}; -typedef struct slap_component_assertion_value { +struct ComponentAssertionValue { char* cav_buf; char* cav_ptr; char* cav_end; -} ComponentAssertionValue; +}; typedef int encoder_func LDAP_P(( void* b, void* comp)); -struct slap_component_syntax_info; - typedef int gser_decoder_func LDAP_P(( void* mem_op, void* b, - struct slap_component_syntax_info** comp_syn_info, + ComponentSyntaxInfo** comp_syn_info, int* len, int mode)); @@ -2986,14 +3000,14 @@ typedef int ber_decoder_func LDAP_P(( void* b, int tag, int elmtLen, - struct slap_component_syntax_info* comp_syn_info, + ComponentSyntaxInfo* comp_syn_info, int* len, int mode)); typedef int ber_tag_decoder_func LDAP_P(( void* mem_op, void* b, - struct slap_component_syntax_info* comp_syn_info, + ComponentSyntaxInfo* comp_syn_info, int* len, int mode)); @@ -3014,17 +3028,16 @@ typedef void* alloc_nibble_func LDAP_P (( typedef void free_nibble_func LDAP_P (( void* nm )); -struct slap_component_syntax_info; typedef void convert_assert_to_comp_func LDAP_P (( void *mem_op, - struct slap_component_syntax_info* csi_attr, + ComponentSyntaxInfo* csi_attr, struct berval* bv, - struct slap_component_syntax_info** csi, + ComponentSyntaxInfo** csi, int* len, int mode )); typedef int convert_asn_to_ldap_func LDAP_P (( - struct slap_component_syntax_info* csi, + ComponentSyntaxInfo* csi, struct berval *bv )); typedef void free_component_func LDAP_P (( @@ -3033,8 +3046,8 @@ typedef void free_component_func LDAP_P (( typedef int test_component_func LDAP_P (( void* attr_mem_op, void* assert_mem_op, - struct slap_component_syntax_info* csi, - struct slap_component_assertion* ca)); + ComponentSyntaxInfo* csi, + ComponentAssertion* ca)); typedef void* test_membership_func LDAP_P (( void* in )); @@ -3042,43 +3055,41 @@ typedef void* test_membership_func LDAP_P (( typedef void* get_component_info_func LDAP_P (( int in )); -struct slap_component_syntax_info; - typedef int component_encoder_func LDAP_P (( void* mem_op, - struct slap_component_syntax_info* csi, + ComponentSyntaxInfo* csi, struct berval* nvals )); typedef int allcomponent_matching_func LDAP_P(( char* oid, - struct slap_component_syntax_info* comp1, - struct slap_component_syntax_info* comp)); + ComponentSyntaxInfo* comp1, + ComponentSyntaxInfo* comp)); -typedef struct slap_component_desc { +struct ComponentDesc { /* Don't change the order of following four fields */ - int cd_tag; - AttributeType *cd_comp_type; - struct berval cd_ad_type;/* ad_type, ad_cname */ - struct berval cd_ad_cname;/* ad_type, ad_cname */ - unsigned cd_flags; /*ad_flags*/ - int cd_type; - int cd_type_id; - encoder_func *cd_ldap_encoder; - encoder_func *cd_gser_encoder; - encoder_func *cd_ber_encoder; - gser_decoder_func *cd_gser_decoder; - ber_decoder_func *cd_ber_decoder; - comp_free_func *cd_free; + int cd_tag; + AttributeType *cd_comp_type; + struct berval cd_ad_type; /* ad_type, ad_cname */ + struct berval cd_ad_cname; /* ad_type, ad_cname */ + unsigned cd_flags; /* ad_flags */ + int cd_type; + int cd_type_id; + encoder_func *cd_ldap_encoder; + encoder_func *cd_gser_encoder; + encoder_func *cd_ber_encoder; + gser_decoder_func *cd_gser_decoder; + ber_decoder_func *cd_ber_decoder; + comp_free_func *cd_free; extract_component_from_id_func* cd_extract_i; allcomponent_matching_func *cd_all_match; -} ComponentDesc; +}; -typedef struct slap_component_syntax_info { - Syntax* csi_syntax; - ComponentDesc* csi_comp_desc; -} ComponentSyntaxInfo; +struct ComponentSyntaxInfo { + Syntax *csi_syntax; + ComponentDesc *csi_comp_desc; +}; -#endif +#endif /* LDAP_COMP_MATCH */ /* slab heap data structures */ diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index b35be8e150..73838ab068 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -59,46 +59,46 @@ typedef struct cookie_state { typedef struct syncinfo_s { struct syncinfo_s *si_next; - struct slap_backend_db *si_be; - struct slap_backend_db *si_wbe; - struct re_s *si_re; - int si_rid; - char si_ridtxt[8]; + BackendDB *si_be; + BackendDB *si_wbe; + struct re_s *si_re; + int si_rid; + char si_ridtxt[8]; slap_bindconf si_bindconf; struct berval si_base; struct berval si_logbase; struct berval si_filterstr; struct berval si_logfilterstr; - int si_scope; - int si_attrsonly; - char *si_anfile; + int si_scope; + int si_attrsonly; + char *si_anfile; AttributeName *si_anlist; AttributeName *si_exanlist; - char **si_attrs; - char **si_exattrs; - int si_allattrs; - int si_allopattrs; - int si_schemachecking; - int si_type; /* the active type */ - int si_ctype; /* the configured type */ - time_t si_interval; - time_t *si_retryinterval; - int *si_retrynum_init; - int *si_retrynum; + char **si_attrs; + char **si_exattrs; + int si_allattrs; + int si_allopattrs; + int si_schemachecking; + int si_type; /* the active type */ + int si_ctype; /* the configured type */ + time_t si_interval; + time_t *si_retryinterval; + int *si_retrynum_init; + int *si_retrynum; struct sync_cookie si_syncCookie; cookie_state *si_cookieState; - int si_cookieAge; - int si_manageDSAit; - int si_slimit; - int si_tlimit; - int si_refreshDelete; - int si_refreshPresent; - int si_syncdata; - int si_logstate; - int si_conn_setup; - Avlnode *si_presentlist; - LDAP *si_ld; - LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist; + int si_cookieAge; + int si_manageDSAit; + int si_slimit; + int si_tlimit; + int si_refreshDelete; + int si_refreshPresent; + int si_syncdata; + int si_logstate; + int si_conn_setup; + Avlnode *si_presentlist; + LDAP *si_ld; + LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist; ldap_pvt_thread_mutex_t si_mutex; } syncinfo_t; @@ -120,9 +120,9 @@ static struct berval * slap_uuidstr_from_normalized( struct berval *, struct berval *, void * ); /* callback functions */ -static int dn_callback( struct slap_op *, struct slap_rep * ); -static int nonpresent_callback( struct slap_op *, struct slap_rep * ); -static int null_callback( struct slap_op *, struct slap_rep * ); +static int dn_callback( Operation *, SlapReply * ); +static int nonpresent_callback( Operation *, SlapReply * ); +static int null_callback( Operation *, SlapReply * ); static AttributeDescription *sync_descs[4]; diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c index c5b36cfdfd..5c76378ccc 100644 --- a/servers/slapd/syntax.c +++ b/servers/slapd/syntax.c @@ -30,7 +30,7 @@ struct sindexrec { }; static Avlnode *syn_index = NULL; -static LDAP_SLIST_HEAD(SyntaxList, slap_syntax) syn_list +static LDAP_SLIST_HEAD(SyntaxList, Syntax) syn_list = LDAP_SLIST_HEAD_INITIALIZER(&syn_list); static int -- 2.39.5